diff --git a/gogs/README.md b/gogs/README.md index 98d1f80..995ce44 100644 --- a/gogs/README.md +++ b/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 ``` diff --git a/gogs/arm/Dockerfile b/gogs/arm/Dockerfile deleted file mode 100644 index b80897f..0000000 --- a/gogs/arm/Dockerfile +++ /dev/null @@ -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/"] diff --git a/gogs/arm/docker-compose.yml b/gogs/arm/docker-compose.yml index 00f2567..515c667 100644 --- a/gogs/arm/docker-compose.yml +++ b/gogs/arm/docker-compose.yml @@ -1,8 +1,10 @@ -gogs: - image: easypi/gogs-arm - ports: - - "2222:22" - - "3000:3000" - volumes: - - ./data:/data - restart: always +version: "3.8" +services: + gogs: + image: gogs/gogs + ports: + - "2222:22" + - "3000:3000" + volumes: + - ./data:/data + restart: unless-stopped diff --git a/gogs/docker-compose.yml b/gogs/docker-compose.yml index a333cb3..515c667 100644 --- a/gogs/docker-compose.yml +++ b/gogs/docker-compose.yml @@ -1,8 +1,10 @@ -gogs: - image: gogs/gogs - ports: - - "2222:22" - - "3000:3000" - volumes: - - ./data:/data - restart: always +version: "3.8" +services: + gogs: + image: gogs/gogs + ports: + - "2222:22" + - "3000:3000" + volumes: + - ./data:/data + restart: unless-stopped