From 1562e9ab707f13e922ea52361fcdb663a14239fb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 28 Apr 2017 19:55:19 +0800 Subject: [PATCH] Refactor Dockerfile 1. Use `apk -U --no-cache add` instead of `apk update` + `apk add` + manually cache clean up. 2. Separate package installation and user, group setup, the combination to reduce a docker image layer didn't bring benefits here, only makes Dockerfiles more complex. --- Dockerfile | 9 +++------ Dockerfile.aarch64 | 9 +++------ Dockerfile.rpi | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d47a18ba61..02e22e801dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,7 @@ MAINTAINER Thomas Boerger EXPOSE 22 3000 -RUN apk update && \ - apk add \ +RUN apk -U --no-cache add \ su-exec \ ca-certificates \ sqlite \ @@ -14,10 +13,8 @@ RUN apk update && \ s6 \ curl \ openssh \ - tzdata && \ - rm -rf \ - /var/cache/apk/* && \ - addgroup \ + tzdata +RUN addgroup \ -S -g 1000 \ git && \ adduser \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 795e3548fe7..d9788ee7394 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,8 +2,7 @@ FROM aarch64/alpine:3.5 EXPOSE 22 3000 -RUN apk update && \ - apk add \ +RUN apk -U --no-cache add \ su-exec \ ca-certificates \ sqlite \ @@ -13,10 +12,8 @@ RUN apk update && \ s6 \ curl \ openssh \ - tzdata && \ - rm -rf \ - /var/cache/apk/* && \ - addgroup \ + tzdata +RUN addgroup \ -S -g 1000 \ git && \ adduser \ diff --git a/Dockerfile.rpi b/Dockerfile.rpi index e334ffc0b47..3484b2e6e28 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -3,8 +3,7 @@ MAINTAINER Thomas Boerger EXPOSE 22 3000 -RUN apk update && \ - apk add \ +RUN apk -U --no-cache add \ su-exec \ ca-certificates \ sqlite \ @@ -14,10 +13,8 @@ RUN apk update && \ s6 \ curl \ openssh \ - tzdata && \ - rm -rf \ - /var/cache/apk/* && \ - addgroup \ + tzdata +RUN addgroup -S -g 1000 \ git && \ adduser \