diff --git a/base/containerd/Dockerfile b/base/containerd/Dockerfile index 239ee5215..27374fd4c 100644 --- a/base/containerd/Dockerfile +++ b/base/containerd/Dockerfile @@ -9,7 +9,7 @@ RUN \ linux-headers \ make \ && true -ENV CONTAINERD_COMMIT=0e0ae74b824c71f991de4765711a383450d60655 +ENV CONTAINERD_COMMIT=8353da59c6ae7e1933aac2228df23541ef8b163f RUN mkdir -p $GOPATH/src/github.com/docker && \ cd $GOPATH/src/github.com/docker && \ git clone https://github.com/docker/containerd.git diff --git a/base/runc/Dockerfile b/base/runc/Dockerfile index 942f3afc3..487161aaf 100644 --- a/base/runc/Dockerfile +++ b/base/runc/Dockerfile @@ -10,7 +10,7 @@ RUN \ linux-headers \ make \ && true -ENV RUNC_COMMIT=49a33c41f830c7863c3e53e547d071cd0c0f27b7 +ENV RUNC_COMMIT=31980a53ae7887b2c8f8715d13c3eb486c27b6cf RUN mkdir -p $GOPATH/src/github.com/opencontainers && \ cd $GOPATH/src/github.com/opencontainers && \ git clone https://github.com/opencontainers/runc.git diff --git a/examples/gcp.yaml b/examples/gcp.yaml index 541e3e148..fcf654e93 100644 --- a/examples/gcp.yaml +++ b/examples/gcp.yaml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" +init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/examples/sshd.yaml b/examples/sshd.yaml index 6f7c9ad0e..c48fa3065 100644 --- a/examples/sshd.yaml +++ b/examples/sshd.yaml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" +init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/examples/vmware.yaml b/examples/vmware.yaml index f4b6a0af4..be3ae5a3a 100644 --- a/examples/vmware.yaml +++ b/examples/vmware.yaml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" -init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" +init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/moby.yaml b/moby.yaml index 971539382..eb1cc003b 100644 --- a/moby.yaml +++ b/moby.yaml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" +init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index f26ef8894..ee1ebe3cd 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -5,8 +5,6 @@ RUN \ apk --no-cache upgrade -a && \ apk --no-cache add \ dhcpcd \ - e2fsprogs \ - e2fsprogs-extra \ && rm -rf /var/cache/apk/* COPY . ./ diff --git a/pkg/init/Makefile b/pkg/init/Makefile index 95116685c..cc0353dca 100644 --- a/pkg/init/Makefile +++ b/pkg/init/Makefile @@ -1,7 +1,7 @@ -CONTAINERD_IMAGE=mobylinux/containerd:c9c8a069da6dccd2803ab476ee0d57a8768f0dcb@sha256:ff5aa0b1086e8c600d6e1508cfae4da31e4935d36ec40f0128aa73113b664e7f +CONTAINERD_IMAGE=mobylinux/containerd:a688df6aee1e3700eb8d54dbc81070361df397a2@sha256:59ee3da05fe4dad4fbecff582c86fc30ce75e19a225eeeb07e203c9cc36fe34f CONTAINERD_BINARIES=usr/bin/containerd usr/bin/containerd-shim usr/bin/ctr usr/bin/dist -RUNC_IMAGE=mobylinux/runc:f1cee12a65e7b7de06a01aec24609dc3175e1542@sha256:ff1ead6aa4388418ee07f8e93304e5b2fa9b975fe2399474d408654a1411a44a +RUNC_IMAGE=mobylinux/runc:94c54debf9a3ebb6d31311bdddb881ea07486dcd@sha256:13cabc1017c6448498e74bae9892ebc9dbad9e5d68f7df6b3855a15522e3a86b RUNC_BINARY=usr/bin/runc C_COMPILE=mobylinux/c-compile:81a6bd8ff45d769b60a2ee1acdaccda11ab835c8@sha256:eac250997a3b9784d3285a03c0c8311d4ca6fb63dc75164c987411ba93006487 diff --git a/test/test.yaml b/test/test.yaml index 075ad2c6f..69b5418e4 100644 --- a/test/test.yaml +++ b/test/test.yaml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" -init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" +init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" system: - name: binfmt image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"