From 05123a7afaaaf8aea0389254795147ea76684fbd Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 16 Mar 2017 19:14:08 +0000 Subject: [PATCH] Clean up apk cache in init See #1312 Signed-off-by: Justin Cormack --- base/init/Dockerfile | 7 ++++--- examples/gcp.yaml | 2 +- examples/sshd.yaml | 2 +- moby.yaml | 2 +- test.yaml | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/base/init/Dockerfile b/base/init/Dockerfile index 9102b92a6..f26ef8894 100644 --- a/base/init/Dockerfile +++ b/base/init/Dockerfile @@ -1,11 +1,12 @@ FROM alpine:3.5 RUN \ - apk update && apk upgrade -a && \ - apk add --no-cache \ + apk --no-cache update && \ + apk --no-cache upgrade -a && \ + apk --no-cache add \ dhcpcd \ e2fsprogs \ e2fsprogs-extra \ - && true + && rm -rf /var/cache/apk/* COPY . ./ diff --git a/examples/gcp.yaml b/examples/gcp.yaml index 2323e0128..8fdfff17e 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:1402058c0f90adf2b12fcfb8332b334c7e9c5d8c" +init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/examples/sshd.yaml b/examples/sshd.yaml index c17a06141..556fdbe64 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:1402058c0f90adf2b12fcfb8332b334c7e9c5d8c" +init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/moby.yaml b/moby.yaml index d85b53960..971539382 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:1402058c0f90adf2b12fcfb8332b334c7e9c5d8c" +init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/test.yaml b/test.yaml index c9d655513..6c943e8b2 100644 --- a/test.yaml +++ b/test.yaml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" -init: "mobylinux/init:1402058c0f90adf2b12fcfb8332b334c7e9c5d8c" +init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" system: - name: binfmt image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"