mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-19 21:41:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #525 from flatcar-linux/runc-1.0.0_rc92-main

Browse Source 
Upgrade Runc in main from 1.0.0_rc90 to 1.0.0_rc92
This commit is contained in:
Dongsu Park 2020-09-16 15:06:44 +02:00 committed by GitHub
commit 2cd4943889
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild vendored
View File

@ -29,7 +29,7 @@ SLOT="0"
IUSE="+btrfs hardened"
DEPEND="btrfs? ( sys-fs/btrfs-progs )"
RDEPEND="~app-emulation/docker-runc-1.0.0_rc90
RDEPEND="~app-emulation/docker-runc-1.0.0_rc92
sys-libs/libseccomp"
S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest vendored
View File

@ -1,2 +1,2 @@
DIST docker-runc-1.0.0_rc2_p136.tar.gz 561705 BLAKE2B 4dd5dc689db1ac632bf10a5060f5681c7e44716caf8d3730683aad9df29c7b2628fa9e7253d86d87e9dfd7d27b545713154fa0f2984ca52908b16ab089be5646 SHA512 6052b95042082c3345caf25d3646f47b82c151ff3aca2ca4510dbf72ee80056d8c4077f2a1b48a9f4178c41185835ff51461e52ad47969534ea6febf7cac74f1
DIST docker-runc-1.0.0_rc90.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7
DIST docker-runc-1.0.0_rc92.tar.gz 2063336 BLAKE2B ca28d520107ddf66f4657ab6b7c61f40a0d1e0eb9b926412cdc49ba40100de1487fdc89c756b703b6fafd66a6a8f730e1abeb39383c0a968f5240952e3831193 SHA512 ed3bd916656b6d5d2aa8c799a4e960b0986bf0925a837ee3d29cf970f0844030ba9786f9deb462cce921c423977a44cbfbe7bce6ed4ec2247e66951c9ac5466c

6
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc90.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc92.ebuild vendored
View File

@ -11,8 +11,8 @@ COREOS_GO_VERSION="go1.15"
# Update the patch number when this commit is changed (i.e. the _p in the ebuild).
# The patch version is arbitrarily the number of commits since the tag version
# specified in the ebuild name. For example:
# $ git log --oneline v1.0.0-rc90..${COMMIT_ID} | wc -l
COMMIT_ID="dc9208a3303feef5b3839f4323d9beb36df0a9dd"
# $ git log --oneline v1.0.0-rc92..${COMMIT_ID} | wc -l
COMMIT_ID="3d68c79de7184b0eba97946d4f478736f46bf207"
inherit eutils flag-o-matic coreos-go vcs-snapshot
@ -61,7 +61,7 @@ src_compile() {
)
GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \
VERSION=1.0.0-rc90+dev.docker-19.03 \
VERSION=1.0.0-rc92+dev.docker-19.03 \
COMMIT="${COMMIT_ID}"
}

6
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/files/0001-temporarily-disable-selinux.GetEnabled-error-checks.patch vendored
View File

@ -26,7 +26,7 @@ index 3b42f301..bace067d 100644
return fmt.Errorf("unable to restrict sys entries without a private MNT namespace")
}
- if config.ProcessLabel != "" && !selinux.GetEnabled() {
- return fmt.Errorf("selinux label is specified in config, but selinux is disabled or not supported")
- return errors.New("selinux label is specified in config, but selinux is disabled or not supported")
- }
return nil
@ -41,14 +41,14 @@ index b05e7b60..ce50db14 100644
"github.com/opencontainers/runtime-spec/specs-go"
- selinux "github.com/opencontainers/selinux/go-selinux"
"github.com/coreos/go-systemd/activation"
"github.com/coreos/go-systemd/v22/activation"
"github.com/pkg/errors"
@@ -388,9 +387,6 @@ func validateProcessSpec(spec *specs.Process) error {
if len(spec.Args) == 0 {
return fmt.Errorf("args must not be empty")
}
- if spec.SelinuxLabel != "" && !selinux.GetEnabled() {
- return fmt.Errorf("selinux label is specified in config, but selinux is disabled or not supported")
- return errors.New("selinux label is specified in config, but selinux is disabled or not supported")
- }
return nil
}

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -65,7 +65,7 @@ RDEPEND="
>=app-arch/xz-utils-4.9
dev-libs/libltdl
~app-emulation/containerd-1.1.2
~app-emulation/docker-runc-1.0.0_rc90[apparmor?,seccomp?]
~app-emulation/docker-runc-1.0.0_rc92[apparmor?,seccomp?]
~app-emulation/docker-proxy-0.8.0_p20180709
container-init? ( >=sys-process/tini-0.13.1 )
"

2
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild vendored
View File

@ -14,7 +14,7 @@ RDEPEND="
~app-emulation/docker-19.03.12
~app-emulation/containerd-1.3.7
~app-emulation/docker-proxy-0.8.0_p20180709
~app-emulation/docker-runc-1.0.0_rc90
~app-emulation/docker-runc-1.0.0_rc92
=dev-libs/libltdl-2.4.6
=sys-process/tini-0.18.0
"