USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docker: fix broken SSHD for Dockerfile.rpi (#6278)

pull/6283/head
ᴜɴᴋɴᴡᴏɴ 2020-08-24 23:22:31 +08:00 committed by GitHub
parent c1db31c130
commit 4e5b7c5d24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/Dockerfile.aarch64
View File

@ -7,7 +7,7 @@ RUN apk --no-cache --no-progress add --virtual \
WORKDIR /gogs.io/gogs WORKDIR /gogs.io/gogs
COPY . . COPY . .
RUN make build-no-gen TAGS="cert pam" RUN make build TAGS="cert pam"
FROM arm64v8/alpine:3.11 FROM arm64v8/alpine:3.11
ADD https://github.com/tianon/gosu/releases/download/1.11/gosu-arm64 /usr/sbin/gosu 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 ENV GOGS_CUSTOM /data/gogs
# Configure LibC Name Service # Configure LibC Name Service
COPY docker/nsswitch.conf /etc/nsswitch.conf COPY docker/nsswitch.conf /etc/nsswitch.conf
WORKDIR /app/gogs WORKDIR /app/gogs
@ -37,7 +37,7 @@ COPY --from=binarybuilder /gogs.io/gogs/gogs .
RUN ./docker/finalize.sh RUN ./docker/finalize.sh
# Configure Docker Container # Configure Docker Container
VOLUME ["/data", "/backup"] VOLUME ["/data", "/backup"]
EXPOSE 22 3000 EXPOSE 22 3000
ENTRYPOINT ["/app/gogs/docker/start.sh"] ENTRYPOINT ["/app/gogs/docker/start.sh"]

8
docker/Dockerfile.rpi
View File

@ -7,9 +7,9 @@ RUN apk --no-cache --no-progress add --virtual \
WORKDIR /gogs.io/gogs WORKDIR /gogs.io/gogs
COPY . . 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 ADD https://github.com/tianon/gosu/releases/download/1.12/gosu-armhf /usr/sbin/gosu
RUN chmod +x /usr/sbin/gosu \ RUN chmod +x /usr/sbin/gosu \
&& echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \ && 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 ENV GOGS_CUSTOM /data/gogs
# Configure LibC Name Service # Configure LibC Name Service
COPY docker/nsswitch.conf /etc/nsswitch.conf COPY docker/nsswitch.conf /etc/nsswitch.conf
WORKDIR /app/gogs WORKDIR /app/gogs
@ -37,7 +37,7 @@ COPY --from=binarybuilder /gogs.io/gogs/gogs .
RUN ./docker/finalize.sh RUN ./docker/finalize.sh
# Configure Docker Container # Configure Docker Container
VOLUME ["/data", "/backup"] VOLUME ["/data", "/backup"]
EXPOSE 22 3000 EXPOSE 22 3000
ENTRYPOINT ["/app/gogs/docker/start.sh"] ENTRYPOINT ["/app/gogs/docker/start.sh"]

4
docker/s6/openssh/setup
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 if ! test -f /data/ssh/ssh_host_rsa_key; then
ssh-keygen -q -f /data/ssh/ssh_host_rsa_key -N '' -t rsa ssh-keygen -q -f /data/ssh/ssh_host_rsa_key -N '' -t rsa
fi 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 ssh-keygen -q -f /data/ssh/ssh_host_ed25519_key -N '' -t ed25519
fi fi
# Set correct right to ssh keys # Set correct right to ssh keys
chown -R root:root /data/ssh/* chown -R root:root /data/ssh/*
chmod 0700 /data/ssh chmod 0700 /data/ssh
chmod 0600 /data/ssh/* chmod 0600 /data/ssh/*