diff options
| author | Jean-Philippe Roemer <jp@roemer.im> | 2016-02-25 17:41:41 +0000 |
|---|---|---|
| committer | Jean-Philippe Roemer <jp@roemer.im> | 2016-02-25 20:43:40 +0000 |
| commit | 7845075bd24997e625b205d5159e847b40c029dc (patch) | |
| tree | 3305c51986015c4e6065c88b6b4aee04486f7ab2 | |
| parent | 129638117f1eed78475a041bd65097e56939caca (diff) | |
| download | gitea-7845075bd24997e625b205d5159e847b40c029dc.tar.gz gitea-7845075bd24997e625b205d5159e847b40c029dc.zip | |
Dockerfile & Dockerfile.pi updates
- Upgrade of gosu to v1.7
- Change in docker/build.sh to use `--no-cache` to prevent APKINDEX creation when installing dev dependencies
- Manual upgrade of Alpine on Raspberry Pi when building to make sure the environment is the same as the standard Dockerfile
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Dockerfile.rpi | 11 | ||||
| -rwxr-xr-x | docker/build.sh | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile index 0975135a10..8853eab51a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.3 MAINTAINER jp@roemer.im # Install system utils & Gogs runtime dependencies -ADD https://github.com/tianon/gosu/releases/download/1.6/gosu-amd64 /usr/sbin/gosu +ADD https://github.com/tianon/gosu/releases/download/1.7/gosu-amd64 /usr/sbin/gosu RUN chmod +x /usr/sbin/gosu \ && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat diff --git a/Dockerfile.rpi b/Dockerfile.rpi index fb13645c6a..6e2c4264b6 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -2,13 +2,12 @@ FROM hypriot/rpi-alpine-scratch:v3.2 MAINTAINER jp@roemer.im, raxetul@gmail.com # Install system utils & Gogs runtime dependencies -ADD https://github.com/tianon/gosu/releases/download/1.6/gosu-armhf /usr/sbin/gosu -RUN echo "http://dl-4.alpinelinux.org/alpine/v3.3/main/" | tee /etc/apk/repositories \ +ADD https://github.com/tianon/gosu/releases/download/1.7/gosu-armhf /usr/sbin/gosu +RUN chmod +x /usr/sbin/gosu \ + && echo "http://dl-4.alpinelinux.org/alpine/v3.3/main/" | tee /etc/apk/repositories \ && echo "http://dl-4.alpinelinux.org/alpine/v3.3/community/" | tee -a /etc/apk/repositories \ - && echo "@edge http://dl-4.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories \ - && apk -U --no-progress upgrade \ - && apk -U --no-progress add ca-certificates bash git linux-pam s6@edge curl openssh socat \ - && chmod +x /usr/sbin/gosu + && apk -U --no-progress upgrade && rm -f /var/cache/apk/APKINDEX.* \ + && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat ENV GOGS_CUSTOM /data/gogs diff --git a/docker/build.sh b/docker/build.sh index e109affc53..0bf5c0131d 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -7,7 +7,7 @@ export GOPATH=/tmp/go export PATH=${PATH}:${GOPATH}/bin # Install build deps -apk -U --no-progress add --virtual build-deps linux-pam-dev go gcc musl-dev +apk --no-cache --no-progress add --virtual build-deps linux-pam-dev go gcc musl-dev # Init go environment to build Gogs mkdir -p ${GOPATH}/src/github.com/gogits/ |