update gogs

gogs/README.md

@@ -3,19 +3,6 @@ gogs
 
 [Gogs][1] (Go Git Service) is a painless self-hosted Git service.
 
-## docker-compose.yml
-
-```yaml
-gogs:
-  image: gogs/gogs
-  ports:
-    - "2222:22"
-    - "3000:3000"
-  volumes:
-    - ./data:/data
-  restart: always
-```
-
 ## up and running
 
 ```

gogs/arm/Dockerfile

@@ -1,50 +0,0 @@
-#
-# Dockerfile for gogs-arm
-#
-
-FROM arm32v7/alpine:3
-MAINTAINER EasyPi Software Foundation
-
-ENV GOSU_VERSION 1.12
-ENV GOGS_VERSION 0.12.3
-ENV GOGS_CUSTOM /data/gogs
-
-RUN apk add --no-cache \
-        bash \
-        ca-certificates \
-        curl \
-        git \
-        linux-pam \
-        openssh \
-        s6 \
-        socat \
-        tar
-
-RUN set -xe \
-    && adduser -H -D -g 'Gogs Git User' -h /data/git -s /bin/bash git \
-    && passwd -u git \
-    && echo "export GOGS_CUSTOM=${GOGS_CUSTOM}" >> /etc/profile
-
-RUN set -xe \
-    && curl -L https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-armhf > /usr/sbin/gosu \
-    && chmod +x /usr/sbin/gosu
-
-RUN set -xe \
-    && mkdir /app/ \
-    && cd /app/ \
-    && curl -LO https://github.com/gogits/gogs/releases/download/v${GOGS_VERSION}/raspi_armv7.zip \
-    && unzip raspi_armv7.zip \
-    && rm raspi_armv7.zip \
-    && ln -s /lib/libc.musl-armv7.so.1 /lib/ld-linux-armhf.so.3
-
-RUN set -xe \
-    && cd /app/gogs/ \
-    && curl -L https://github.com/gogits/gogs/archive/v${GOGS_VERSION}.tar.gz | tar xz --strip 1 gogs-${GOGS_VERSION}/docker \
-    && mv docker/nsswitch.conf /etc/
-
-WORKDIR /app/gogs/
-VOLUME /data/
-
-EXPOSE 22 3000
-
-CMD ["docker/start.sh", "/bin/s6-svscan", "/app/gogs/docker/s6/"]

gogs/arm/docker-compose.yml

@@ -1,8 +1,10 @@
+version: "3.8"
+services:
   gogs:
-  image: easypi/gogs-arm
+    image: gogs/gogs
     ports:
       - "2222:22"
       - "3000:3000"
     volumes:
       - ./data:/data
-  restart: always
+    restart: unless-stopped

gogs/docker-compose.yml

@@ -1,3 +1,5 @@
+version: "3.8"
+services:
   gogs:
     image: gogs/gogs
     ports:
@@ -5,4 +7,4 @@ gogs:
       - "3000:3000"
     volumes:
       - ./data:/data
-  restart: always
+    restart: unless-stopped