Merge pull request #2665 from muhmuhten/develop

Dockerfile cleanup for Alpine 3.3

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 \
+RUN chmod +x /usr/sbin/gosu \
- && apk -U --no-progress upgrade \
+ && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat
- && apk -U --no-progress add ca-certificates bash git linux-pam s6@edge curl openssh socat \
- && chmod +x /usr/sbin/gosu
 
 ENV GOGS_CUSTOM /data/gogs