From 7845075bd24997e625b205d5159e847b40c029dc Mon Sep 17 00:00:00 2001 From: Jean-Philippe Roemer Date: Thu, 25 Feb 2016 17:41:41 +0000 Subject: [PATCH 1/3] 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 --- Dockerfile | 2 +- Dockerfile.rpi | 11 +++++------ 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/ From ab4eacd15f44e228834a8edc67fd139263fb5347 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Roemer Date: Thu, 25 Feb 2016 20:00:26 +0000 Subject: [PATCH 2/3] Update .dockerignore to add new unneeded files from the Docker Context --- .dockerignore | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.dockerignore b/.dockerignore index 8822b3436f..092eef43c4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,20 +1,21 @@ .git -.git/ -.git/* +.git/** conf -conf/ -conf/* +conf/** packager -packager/ -packager/* +packager/** scripts -scripts/ -scripts/* +scripts/** +.github/ +.github/** +config.codekit +LICENSE +Makefile +.dockerignore *.yml *.md .bra.toml .editorconfig .gitignore .gopmfile -config.codekit -LICENSE +Dockerfile* From db1494920925f9ca7a887e02b42394291300acf8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Roemer Date: Fri, 26 Feb 2016 17:07:31 +0000 Subject: [PATCH 3/3] Update Docker REAMDE.md - Remove the known issue about `.dockerignore` being ignored during DockerHub automated build as this has been fixed - Added a note on the fact that we currently do no support building the container on RPi1 --- docker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/README.md b/docker/README.md index af6dfc7ac4..bfdb4a60f0 100644 --- a/docker/README.md +++ b/docker/README.md @@ -88,4 +88,4 @@ Steps to upgrade Gogs with Docker: ## Known Issues -- `.dockerignore` seems to be ignored during Docker Hub Automated build +- The docker container can not currently be build on Raspberry 1 (armv6l) as our base image `alpine` does not have a `go` package available for this platform.