summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-02-22 11:59:18 -0500
committerUnknwon <u@gogs.io>2016-02-22 11:59:18 -0500
commit90fab0be6bc5acce1faa4b97a85ddde5f37f31d9 (patch)
treed24a8952002e16f424d85b9ff81c14463be9e263
parentc9516c4c60684d20c45e4c0c15911603dc9f20b3 (diff)
parent5609585ec18ba11a7b139c8e65d55e3c65ac3028 (diff)
downloadgitea-90fab0be6bc5acce1faa4b97a85ddde5f37f31d9.tar.gz
gitea-90fab0be6bc5acce1faa4b97a85ddde5f37f31d9.zip
Merge pull request #2665 from muhmuhten/develop
Dockerfile cleanup for Alpine 3.3
-rw-r--r--Dockerfile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index af29957c00..0975135a10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,8 @@ 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 \
- && 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
+RUN chmod +x /usr/sbin/gosu \
+ && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat
ENV GOGS_CUSTOM /data/gogs