diff --git a/containerd/pkg.yaml b/containerd/pkg.yaml index 2af3b83c..e346826a 100644 --- a/containerd/pkg.yaml +++ b/containerd/pkg.yaml @@ -6,34 +6,25 @@ dependencies: - stage: libseccomp steps: - sources: - - url: https://github.com/containerd/containerd/archive/v1.4.4.tar.gz + - url: https://github.com/containerd/containerd/archive/v1.5.0.tar.gz destination: containerd.tar.gz - sha256: ac62c64664bf62fd44df0891c896eecdb6d93def3438271d7892dca75bc069d1 - sha512: f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070 - env: - GO111MODULE: off + sha256: e1e443c6b4afe2e30b541eb9420edc8d525e0be51a900c4d7fb61365ee4a3fee + sha512: 8af31eaa3d49a9026893e62c1115b3558b6b44736692f326382ab00e51c2f8f79a92580b1c791d6b5dd71e95531c2e7c65625d18ed19a8b7ab2348597a1d97e2 prepare: - | - export GOPATH=/go - mkdir -p ${GOPATH}/src/github.com/containerd/containerd - tar -xzf containerd.tar.gz --strip-components=1 -C ${GOPATH}/src/github.com/containerd/containerd + tar -xzf containerd.tar.gz --strip-components=1 build: - | export PKG_CONFIG_PATH=/usr/lib/pkgconfig export CC=/toolchain/bin/cc # This is required due to "loadinternal: cannot find runtime/cgo". export CGO_ENABLED=1 - export GOPATH=/go export PATH=${PATH}:${TOOLCHAIN}/go/bin - cd ${GOPATH}/src/github.com/containerd/containerd - make bin/containerd bin/containerd-shim bin/containerd-shim-runc-v2 BUILDTAGS='seccomp no_btrfs' VERSION=v1.4.4 REVISION=05f951a3781f4f2c1911b05e61c160e9c30eaa8e + make bin/containerd bin/containerd-shim bin/containerd-shim-runc-v2 BUILDTAGS='seccomp no_btrfs' VERSION=v1.5.0 REVISION=8c906ff108ac28da23f69cc7b74f8e7a470d1df0 install: - | mkdir -p /rootfs/bin - export GOPATH=/go - cp ${GOPATH}/src/github.com/containerd/containerd/bin/containerd /rootfs/bin - cp ${GOPATH}/src/github.com/containerd/containerd/bin/containerd-shim /rootfs/bin - cp ${GOPATH}/src/github.com/containerd/containerd/bin/containerd-shim-runc-v2 /rootfs/bin + cp bin/{containerd,containerd-shim,containerd-shim-runc-v2} /rootfs/bin finalize: - from: /rootfs to: / diff --git a/runc/pkg.yaml b/runc/pkg.yaml index 8468d6b1..553696b0 100644 --- a/runc/pkg.yaml +++ b/runc/pkg.yaml @@ -6,10 +6,10 @@ dependencies: - stage: libseccomp steps: - sources: - - url: https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.tar.xz + - url: https://github.com/opencontainers/runc/releases/download/v1.0.0-rc94/runc.tar.xz destination: runc.tar.xz - sha256: 2f76b623b550588db98e2be72e74aae426f5d4cf736bd92afb91dd5586816daf - sha512: 55d28e07e645bf07d104281e3e80c3df9a53e23342d281a135e8792eb8e8b6b35477dd0ce367032a7f698c4ac939dc7dfcfbffb69cdc7532dd149ff44c5db251 + sha256: 87daf369dcac7f1895e72bc0ee22ba9e29d4678d6d0dd795f336e35c222a801a + sha512: a1ce2a5ae21f0d4ac1b2d26cbf0ef60e119dfffb984c5fdec1e46f55a2bdcf64ed743b52837ed105932b935a60739e62d9b1af2ddd9e4f16ee5c1b81e4f7e360 prepare: - | export GOPATH=/go @@ -26,7 +26,7 @@ steps: export CC=/toolchain/bin/cc # This is required due to "loadinternal: cannot find runtime/cgo". export CGO_ENABLED=1 - make EXTRA_LDFLAGS="-w -s" BUILDTAGS="seccomp" COMMIT=ff819c7e9184c13b7c2607fe6c30ae19403a7aff runc + make EXTRA_LDFLAGS="-w -s" BUILDTAGS="seccomp" COMMIT=2c7861bc5e1b3e756392236553ec14a78a09f8bf runc install: - | export GOPATH=/go