chore: update runc and containerd

* https://github.com/containerd/containerd/releases/tag/v1.5.3 * https://github.com/opencontainers/runc/releases/tag/v1.0.0 Signed-off-by: Alexey Palazhchenko <[email protected]>
siderolabs · Jul 14, 2021 · 6bc118f · 6bc118f
1 parent b6fca88
commit 6bc118f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/containerd/pkg.yaml b/containerd/pkg.yaml
@@ -6,10 +6,11 @@ dependencies:
   - stage: libseccomp
 steps:
   - sources:
-      - url: https://github.com/containerd/containerd/archive/v1.5.2.tar.gz
+        # sync with version and revision in build
+      - url: https://github.com/containerd/containerd/archive/v1.5.3.tar.gz
         destination: containerd.tar.gz
-        sha256: d72a85cbcd60009f41637e97e37a372a2451b369c183e2b58fdab00e1c9fe894
-        sha512: e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
+        sha256: a0085fedeada29ce6c3bea2edd0b8d88b8321de350cb1dc11ecfa7366a4ada24
+        sha512: 38054e6851b288023452ff8b00b7fa8d621c28e6ea1e82428b7449346d7112ee7a55c238e658cf30e1d6eb7f3dc8480a863e17bdb355234d9798226636f7e872
     prepare:
       - |
         tar -xzf containerd.tar.gz --strip-components=1
@@ -20,7 +21,8 @@ steps:
         # This is required due to "loadinternal: cannot find runtime/cgo".
         export CGO_ENABLED=1
         export PATH=${PATH}:${TOOLCHAIN}/go/bin
-        make bin/containerd bin/containerd-shim bin/containerd-shim-runc-v2 BUILDTAGS='seccomp no_btrfs' VERSION=v1.5.2 REVISION=36cc874494a56a253cd181a1a685b44b58a2e34a
+        export BUILDTAGS='seccomp no_btrfs'
+        make bin/containerd bin/containerd-shim bin/containerd-shim-runc-v2 VERSION=v1.5.3 REVISION=0e8719f54c6dc6571fc1170da75a85e86c17636b
     install:
       - |
         mkdir -p /rootfs/bin

diff --git a/runc/pkg.yaml b/runc/pkg.yaml
@@ -6,10 +6,11 @@ dependencies:
   - stage: libseccomp
 steps:
   - sources:
-      - url: https://github.com/opencontainers/runc/releases/download/v1.0.0-rc95/runc.tar.xz
+      # sync with commit in build
+      - url: https://github.com/opencontainers/runc/releases/download/v1.0.0/runc.tar.xz
         destination: runc.tar.xz
-        sha256: 8304b161e1c0ec2cee969b25671a147cd56cb99e6aa534371b2cfb3ec13db2c4
-        sha512: e2f30a4da4a56b1e017a2c3d0dc2df4b719e118f91ba051b29bca5e5cd9c99a07aa0da35c86a1f5748ea1392c951e33bfb4c55d2aef46264dfabf134d7f27e12
+        sha256: ccdf1ac45cb1bb36eb1810457c6b1a513666958d83a96e01fff6085ba179c9f1
+        sha512: 6fd964a2b7c7b5d46f4a634f259c1566d66a638aafbccd62b66d9b876d2c2efca6680fe216b39f2bdb9f3977a192e0e1d0f742adc71e9d977d33df634b8b07ec
     prepare:
       - |
         export GOPATH=/go
@@ -26,7 +27,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=b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7 runc
+        make EXTRA_LDFLAGS="-w -s" BUILDTAGS="seccomp" COMMIT=84113eef6fc27af1b01b3181f31bbaf708715301 runc
     install:
       - |
         export GOPATH=/go