From 12c8953381286edc822529755edfb7971e63fb38 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Roemer Date: Thu, 28 Jan 2016 15:03:02 +0000 Subject: [PATCH 1/2] Update Dockerfile to update alpine to v3.3 & fix virtual package and repository pinning on RPi - Dockerfile now uses alpine:3.3 as base - Dockerfile.rpi now uses v3.3/community repository without pinning - Go package is no longer fetched using repository pinning - Fixes problem while using repository pinning & virtual package at the same time --- Dockerfile | 3 +-- Dockerfile.rpi | 4 ++-- docker/build.sh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2bd6a9716d..af29957c00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 ef3994dd60..68e956225d 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -3,8 +3,8 @@ 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/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 83ef8f2b2b..e109affc53 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/ From 9fbf54ee6b2de3fce97f7665f539fc3f8e42888a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Roemer Date: Thu, 28 Jan 2016 21:27:15 +0000 Subject: [PATCH 2/2] Update Dockerfile.rpi to better match Dockerfile: - Dockerfile.rpi now uses hypriot/rpi-alpine-scratch as base (build script are available w/ a better maintainer & more updates) - Dockerfile.rpi updates alpine from v3.2 to v3.3 to be on par with Dockerfile --- Dockerfile.rpi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rpi b/Dockerfile.rpi index 68e956225d..fb13645c6a 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -1,9 +1,10 @@ -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 "http://dl-4.alpinelinux.org/alpine/v3.3/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 \