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

Commit c7ec47f

Browse files
thaJeztahthaJeztah
committed
bump opencontainers/selinux to v1.2
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 7b397f0) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent b9c06fd commit c7ec47f

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
@@ -37,7 +37,6 @@ import (
3737
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
3838
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
3939
"github.com/opencontainers/runtime-tools/generate"
40-
"github.com/opencontainers/selinux/go-selinux"
4140
"github.com/opencontainers/selinux/go-selinux/label"
4241
"github.com/pkg/errors"
4342
"golang.org/x/net/context"
@@ -396,7 +395,12 @@ func initSelinuxOpts(selinuxOpt *runtime.SELinuxOption) (string, string, error)
396395
selinuxOpt.GetRole(),
397396
selinuxOpt.GetType(),
398397
selinuxOpt.GetLevel())
399-
return label.InitLabels(selinux.DupSecOpt(labelOpts))
398+
399+
options, err := label.DupSecOpt(labelOpts)
400+
if err != nil {
401+
return "", "", err
402+
}
403+
return label.InitLabels(options)
400404
}
401405

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

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ github.com/opencontainers/image-spec v1.0.1
4040
github.com/opencontainers/runc 6635b4f0c6af3810594d2770f662f34ddc15b40d
4141
github.com/opencontainers/runtime-spec v1.0.1
4242
github.com/opencontainers/runtime-tools 6073aff4ac61897f75895123f7e24135204a404d
43-
github.com/opencontainers/selinux b6fa367ed7f534f9ba25391cc2d467085dbb445a
43+
github.com/opencontainers/selinux v1.2
4444
github.com/pkg/errors v0.8.0
4545
github.com/pmezard/go-difflib v1.0.0
4646
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)