Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit 7b397f0

Browse files
thaJeztahthaJeztah
committed
bump opencontainers/selinux to v1.2
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 84f9514 commit 7b397f0

7 files changed

Lines changed: 232 additions & 32 deletions

File tree

‎pkg/server/helpers.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import (
3434
"github.com/containerd/typeurl"
3535
"github.com/docker/distribution/reference"
3636
imagedigest "github.com/opencontainers/go-digest"
37-
"github.com/opencontainers/selinux/go-selinux"
3837
"github.com/opencontainers/selinux/go-selinux/label"
3938
"github.com/pkg/errors"
4039
"golang.org/x/net/context"
@@ -322,7 +321,12 @@ func initSelinuxOpts(selinuxOpt *runtime.SELinuxOption) (string, string, error)
322321
selinuxOpt.GetRole(),
323322
selinuxOpt.GetType(),
324323
selinuxOpt.GetLevel())
325-
return label.InitLabels(selinux.DupSecOpt(labelOpts))
324+
325+
options, err := label.DupSecOpt(labelOpts)
326+
if err != nil {
327+
return "", "", err
328+
}
329+
return label.InitLabels(options)
326330
}
327331

328332
func checkSelinuxLevel(level string) (bool, error) {

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
3636
github.com/opencontainers/image-spec v1.0.1
3737
github.com/opencontainers/runc 12f6a991201fdb8f82579582d5e00e28fba06d0a
3838
github.com/opencontainers/runtime-spec eba862dc2470385a233c7507392675cbeadf7353
39-
github.com/opencontainers/selinux b6fa367ed7f534f9ba25391cc2d467085dbb445a
39+
github.com/opencontainers/selinux v1.2
4040
github.com/pkg/errors v0.8.0
4141
github.com/pmezard/go-difflib v1.0.0
4242
github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823

‎vendor/github.com/opencontainers/selinux/README.md‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/opencontainers/selinux/go-selinux/label/label.go‎

Lines changed: 30 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go‎

Lines changed: 92 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)