diff options
| author | Peter Dave Hello <hsu@peterdavehello.org> | 2017-04-28 19:55:19 +0800 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-04-29 21:05:25 +0200 |
| commit | 1562e9ab707f13e922ea52361fcdb663a14239fb (patch) | |
| tree | 83169d3b389e76b2080e042a656fdeb991e72464 | |
| parent | e31c02d4bf055a9d2a107eb89e0d39062d70f606 (diff) | |
| download | gitea-1562e9ab707f13e922ea52361fcdb663a14239fb.tar.gz gitea-1562e9ab707f13e922ea52361fcdb663a14239fb.zip | |
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.
| -rw-r--r-- | Dockerfile | 9 | ||||
| -rw-r--r-- | Dockerfile.aarch64 | 9 | ||||
| -rw-r--r-- | Dockerfile.rpi | 9 |
3 files changed, 9 insertions, 18 deletions
diff --git a/Dockerfile b/Dockerfile index 2d47a18ba6..02e22e801d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,7 @@ MAINTAINER Thomas Boerger <thomas@webhippie.de> 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 795e3548fe..d9788ee739 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 e334ffc0b4..3484b2e6e2 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -3,8 +3,7 @@ MAINTAINER Thomas Boerger <thomas@webhippie.de> 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 \ |