diff options
| author | Unknwon <u@gogs.io> | 2016-01-29 05:15:08 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-01-29 05:15:08 -0500 |
| commit | cd89d387b6adce8f3d7c26c6e65473043e02cbdc (patch) | |
| tree | f57f3f404e99566f8b6b7112515cf6b6c416d725 | |
| parent | 566163ab8257ba2b828985c2cc00f705341ba73f (diff) | |
| parent | 9fbf54ee6b2de3fce97f7665f539fc3f8e42888a (diff) | |
Merge pull request #2509 from 0rax/develop
Update Docker container with Alpine 3.3 & Fix RPi2 build
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | Dockerfile.rpi | 7 | ||||
| -rwxr-xr-x | docker/build.sh | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -1,10 +1,9 @@ -FROM alpine:3.2 +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 RUN echo "@edge http://dl-4.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories \ - && echo "@community http://dl-4.alpinelinux.org/alpine/edge/community" | 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 diff --git a/Dockerfile.rpi b/Dockerfile.rpi index ef3994dd..fb13645c 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -1,10 +1,11 @@ -FROM sander85/rpi-alpine:latest +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 "@edge http://dl-4.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories \ - && echo "@community http://dl-4.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories \ +RUN 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 diff --git a/docker/build.sh b/docker/build.sh index 83ef8f2b..e109affc 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@community gcc musl-dev +apk -U --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/ |