Skip to content

Commit 691a0f0

Browse files
committed
chore: address moby seccomp deprecation
1 parent 04fcea7 commit 691a0f0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ require (
3333
github.com/gosimple/slug v1.15.0
3434
github.com/moby/buildkit v0.24.0
3535
github.com/moby/go-archive v0.1.0
36+
github.com/moby/profiles/seccomp v0.1.0
3637
github.com/moby/sys/sequential v0.6.0
3738
github.com/moby/sys/user v0.4.0
3839
github.com/moby/sys/userns v0.1.0
@@ -204,7 +205,6 @@ require (
204205
github.com/moby/docker-image-spec v1.3.1 // indirect
205206
github.com/moby/locker v1.0.1 // indirect
206207
github.com/moby/patternmatcher v0.6.0 // indirect
207-
github.com/moby/profiles/seccomp v0.1.0 // indirect
208208
github.com/moby/sys/atomicwriter v0.1.0 // indirect
209209
github.com/moby/sys/mount v0.3.4 // indirect
210210
github.com/moby/sys/mountinfo v0.7.2 // indirect

internal/pkg/runtime/engine/config/oci/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"encoding/json"
1010
"fmt"
1111

12-
dseccomp "github.com/docker/docker/profiles/seccomp"
12+
mseccomp "github.com/moby/profiles/seccomp"
1313
"github.com/opencontainers/cgroups"
1414
specs "github.com/opencontainers/runtime-spec/specs-go"
1515
"github.com/sylabs/singularity/v4/internal/pkg/runtime/engine/config/oci/generate"
@@ -174,7 +174,7 @@ func DefaultConfigV1() (*generate.Generator, error) {
174174
}
175175

176176
if seccomp.Enabled() {
177-
config.Linux.Seccomp, err = dseccomp.GetDefaultProfile(&config)
177+
config.Linux.Seccomp, err = mseccomp.GetDefaultProfile(&config)
178178
if err != nil {
179179
return nil, fmt.Errorf("failed to get seccomp default profile: %s", err)
180180
}

internal/pkg/security/seccomp/seccomp_supported.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"syscall"
1616

1717
"github.com/ccoveille/go-safecast"
18-
dseccomp "github.com/docker/docker/profiles/seccomp"
18+
mseccomp "github.com/moby/profiles/seccomp"
1919
"github.com/opencontainers/runtime-spec/specs-go"
2020
lseccomp "github.com/seccomp/libseccomp-golang"
2121
"github.com/sylabs/singularity/v4/internal/pkg/runtime/engine/config/oci/generate"
@@ -285,7 +285,7 @@ func LoadProfileFromFile(profile string, generator *generate.Generator) error {
285285
generator.Config.Process.Capabilities = &specs.LinuxCapabilities{}
286286
}
287287

288-
seccompConfig, err := dseccomp.LoadProfile(string(data), generator.Config)
288+
seccompConfig, err := mseccomp.LoadProfile(string(data), generator.Config)
289289
if err != nil {
290290
return err
291291
}

0 commit comments

Comments
 (0)