From 3cad8d9492a7dfd85ced9a897f5933d70ed15814 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Roemer Date: Fri, 2 Oct 2015 11:29:11 +0100 Subject: [PATCH] Use app/docker folder for SSH Configureation --- Dockerfile | 4 +--- docker/s6/openssh/run | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 453324a1dc..a3b03c558e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,6 @@ RUN echo "@edge http://dl-4.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/ && apk -U --no-progress add ca-certificates git linux-pam s6@edge curl openssh socat \ && chmod +x /usr/sbin/gosu -# Configure SSH -COPY docker/sshd_config /etc/ssh/sshd_config - # Configure Go and build Gogs ENV GOPATH /tmp/go ENV PATH $PATH:$GOPATH/bin @@ -26,6 +23,7 @@ ENV GOGS_CUSTOM /data/gogs RUN adduser -D -g 'Gogs Git User' git -h /data/git/ -s /bin/sh && passwd -u git RUN echo "export GOGS_CUSTOM=/data/gogs" >> /etc/profile +# Configure Docker Container VOLUME ["/data"] EXPOSE 22 3000 CMD ["./docker/start.sh"] diff --git a/docker/s6/openssh/run b/docker/s6/openssh/run index 891285764a..444863a5c4 100755 --- a/docker/s6/openssh/run +++ b/docker/s6/openssh/run @@ -12,4 +12,4 @@ then chmod 600 /data/ssh/* fi -exec gosu root /usr/sbin/sshd -D -f /etc/ssh/sshd_config +exec gosu root /usr/sbin/sshd -D -f /app/gogs/docker/sshd_config