diff options
| author | Unknwon <u@gogs.io> | 2016-02-26 12:25:32 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-02-26 12:25:32 -0500 |
| commit | 6465adfe5c101ce5396b375236da2dc923903886 (patch) | |
| tree | e483cc9177a1a79b76398348e7397f76dbeb772b | |
| parent | 129638117f1eed78475a041bd65097e56939caca (diff) | |
| parent | db1494920925f9ca7a887e02b42394291300acf8 (diff) | |
| download | gitea-6465adfe5c101ce5396b375236da2dc923903886.tar.gz gitea-6465adfe5c101ce5396b375236da2dc923903886.zip | |
Merge pull request #2707 from gogits/docker/update
Docker Container update
| -rw-r--r-- | .dockerignore | 21 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Dockerfile.rpi | 11 | ||||
| -rw-r--r-- | docker/README.md | 2 | ||||
| -rwxr-xr-x | docker/build.sh | 2 |
5 files changed, 19 insertions, 19 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* 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/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. 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/ |