From ec05c64ead43809d4d033d4c48b4fb6b02a9fb29 Mon Sep 17 00:00:00 2001 From: Kyle Filz Date: Thu, 23 Feb 2017 23:37:21 -0600 Subject: [PATCH] docker: update Dockerfile for Raspberry Pi (#4185) --- Dockerfile.rpi | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Dockerfile.rpi b/Dockerfile.rpi index 8fbe8252..3a53b76f 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -1,19 +1,18 @@ -FROM hypriot/rpi-alpine-scratch:v3.2 -MAINTAINER jp@roemer.im, raxetul@gmail.com +FROM armhf/alpine:3.5 # Install system utils & Gogs runtime dependencies ADD https://github.com/tianon/gosu/releases/download/1.9/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 \ - && 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 tzdata ENV GOGS_CUSTOM /data/gogs -COPY . /app/gogs/ -WORKDIR /app/gogs/ -RUN ./docker/build.sh +COPY . /app/gogs/build +WORKDIR /app/gogs/build + +RUN ./docker/build-go.sh \ + && ./docker/build.sh \ + && ./docker/finalize.sh # Configure LibC Name Service COPY docker/nsswitch.conf /etc/nsswitch.conf @@ -21,5 +20,5 @@ COPY docker/nsswitch.conf /etc/nsswitch.conf # Configure Docker Container VOLUME ["/data"] EXPOSE 22 3000 -ENTRYPOINT ["docker/start.sh"] +ENTRYPOINT ["/app/gogs/docker/start.sh"] CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]