diff options
| -rw-r--r-- | docker/Dockerfile.aarch64 | 6 | ||||
| -rw-r--r-- | docker/Dockerfile.rpi | 8 | ||||
| -rwxr-xr-x | docker/s6/openssh/setup | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 88daf729..f0637299 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -7,7 +7,7 @@ RUN apk --no-cache --no-progress add --virtual \ WORKDIR /gogs.io/gogs COPY . . -RUN make build-no-gen TAGS="cert pam" +RUN make build TAGS="cert pam" FROM arm64v8/alpine:3.11 ADD https://github.com/tianon/gosu/releases/download/1.11/gosu-arm64 /usr/sbin/gosu @@ -28,7 +28,7 @@ RUN chmod +x /usr/sbin/gosu \ ENV GOGS_CUSTOM /data/gogs -# Configure LibC Name Service +# Configure LibC Name Service COPY docker/nsswitch.conf /etc/nsswitch.conf WORKDIR /app/gogs @@ -37,7 +37,7 @@ COPY --from=binarybuilder /gogs.io/gogs/gogs . RUN ./docker/finalize.sh -# Configure Docker Container +# Configure Docker Container VOLUME ["/data", "/backup"] EXPOSE 22 3000 ENTRYPOINT ["/app/gogs/docker/start.sh"] diff --git a/docker/Dockerfile.rpi b/docker/Dockerfile.rpi index a9a1d295..41560145 100644 --- a/docker/Dockerfile.rpi +++ b/docker/Dockerfile.rpi @@ -7,9 +7,9 @@ RUN apk --no-cache --no-progress add --virtual \ WORKDIR /gogs.io/gogs COPY . . -RUN make build-no-gen TAGS="cert pam" +RUN make build TAGS="cert pam" -FROM arm32v7/alpine:3.11 +FROM arm32v7/alpine:3.12 ADD https://github.com/tianon/gosu/releases/download/1.12/gosu-armhf /usr/sbin/gosu RUN chmod +x /usr/sbin/gosu \ && echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \ @@ -28,7 +28,7 @@ RUN chmod +x /usr/sbin/gosu \ ENV GOGS_CUSTOM /data/gogs -# Configure LibC Name Service +# Configure LibC Name Service COPY docker/nsswitch.conf /etc/nsswitch.conf WORKDIR /app/gogs @@ -37,7 +37,7 @@ COPY --from=binarybuilder /gogs.io/gogs/gogs . RUN ./docker/finalize.sh -# Configure Docker Container +# Configure Docker Container VOLUME ["/data", "/backup"] EXPOSE 22 3000 ENTRYPOINT ["/app/gogs/docker/start.sh"] diff --git a/docker/s6/openssh/setup b/docker/s6/openssh/setup index 5333d3c0..4d71e222 100755 --- a/docker/s6/openssh/setup +++ b/docker/s6/openssh/setup @@ -1,6 +1,6 @@ #!/bin/sh -# Check if host keys are present, else create them +# Check if host keys are present, else create them if ! test -f /data/ssh/ssh_host_rsa_key; then ssh-keygen -q -f /data/ssh/ssh_host_rsa_key -N '' -t rsa fi @@ -17,7 +17,7 @@ if ! test -f /data/ssh/ssh_host_ed25519_key; then ssh-keygen -q -f /data/ssh/ssh_host_ed25519_key -N '' -t ed25519 fi -# Set correct right to ssh keys +# Set correct right to ssh keys chown -R root:root /data/ssh/* chmod 0700 /data/ssh chmod 0600 /data/ssh/* |