Merge pull request #1732 from 0rax/develop

Docker Container: Init 1 & Initialisation

.dockerignore

@@ -1,7 +1,15 @@
 .git
+.git/
+.git/*
 conf
+conf/
+conf/*
 packager
+packager/
+packager/*
 scripts
+scripts/
+scripts/*
 *.yml
 *.md
 .bra.toml

Dockerfile

@@ -18,4 +18,5 @@ RUN ./docker/build.sh
 # Configure Docker Container
 VOLUME ["/data"]
 EXPOSE 22 3000
-CMD ["docker/start.sh"]
+ENTRYPOINT ["docker/start.sh"]
+CMD ["/usr/bin/s6-svscan", "/app/gogs/docker/s6/"]

docker/README.md

@@ -69,3 +69,7 @@ Steps to upgrade Gogs with Docker:
 - `docker stop gogs`
 - `docker rm gogs`
 - Finally, create container as the first time and don't forget to do same volume and port mapping.
+
+## Known Issues
+
+- `.dockerignore` seems to be ignored during Docker Hub Automated build

docker/s6/gogs/run

@@ -1,26 +1,8 @@
 #!/bin/sh
-USER=git
 
-if ! test -d /data/gogs; then
+if test -f ./setup; then
-	mkdir -p /data/gogs/data /data/gogs/conf /data/gogs/log /data/git
+    source ./setup
 fi
 
-if ! test -d ~git/.ssh; then
+export USER=git
-    mkdir ~git/.ssh
-    chmod 700 ~git/.ssh
-fi
-
-if ! test -f ~git/.ssh/environment; then
-    echo "GOGS_CUSTOM=${GOGS_CUSTOM}" > ~git/.ssh/environment
-    chmod 600 ~git/.ssh/environment
-fi
-
-cd /app/gogs
-
-ln -sf /data/gogs/log  ./log
-ln -sf /data/gogs/data ./data
-
-chown -R git:git /data /app/gogs ~git/
-
-export USER
 exec gosu $USER /app/gogs/gogs web

docker/s6/gogs/setup

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if ! test -d /data/gogs; then
+    mkdir -p /data/gogs/data /data/gogs/conf /data/gogs/log /data/git
+fi
+
+if ! test -d ~git/.ssh; then
+    mkdir ~git/.ssh
+    chmod 700 ~git/.ssh
+fi
+
+if ! test -f ~git/.ssh/environment; then
+    echo "GOGS_CUSTOM=${GOGS_CUSTOM}" > ~git/.ssh/environment
+    chmod 600 ~git/.ssh/environment
+fi
+
+cd /app/gogs
+
+ln -sf /data/gogs/log  ./log
+ln -sf /data/gogs/data ./data
+
+chown -R git:git /data /app/gogs ~git/

docker/s6/openssh/run

@@ -1,15 +1,7 @@
 #!/bin/sh
 
-if ! test -d /data/ssh
+if test -f ./setup; then
-then
+    source ./setup
-	mkdir -p /data/ssh
-	ssh-keygen -q -f /data/ssh/ssh_host_key -N '' -t rsa1
-	ssh-keygen -q -f /data/ssh/ssh_host_rsa_key -N '' -t rsa
-	ssh-keygen -q -f /data/ssh/ssh_host_dsa_key -N '' -t dsa
-	ssh-keygen -q -f /data/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
-	ssh-keygen -q -f /data/ssh/ssh_host_ed25519_key -N '' -t ed25519
-	chown -R root:root /data/ssh/*
-	chmod 600 /data/ssh/*
 fi
 
 exec gosu root /usr/sbin/sshd -D -f /app/gogs/docker/sshd_config

docker/s6/openssh/setup

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if ! test -d /data/ssh; then
+    mkdir -p /data/ssh
+    ssh-keygen -q -f /data/ssh/ssh_host_key -N '' -t rsa1
+    ssh-keygen -q -f /data/ssh/ssh_host_rsa_key -N '' -t rsa
+    ssh-keygen -q -f /data/ssh/ssh_host_dsa_key -N '' -t dsa
+    ssh-keygen -q -f /data/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
+    ssh-keygen -q -f /data/ssh/ssh_host_ed25519_key -N '' -t ed25519
+    chown -R root:root /data/ssh/*
+    chmod 600 /data/ssh/*
+fi

docker/start.sh

@@ -8,5 +8,9 @@ while read NAME CMD; do
     chmod +x /app/gogs/docker/s6/$NAME/run
 done
 
-# Exec S6 as process manager for gogs and dropbear ssh
+# Exec CMD or S6 by default if nothing present
-exec /usr/bin/s6-svscan /app/gogs/docker/s6/
+if [ $# -gt 0 ];then
+    exec "$@"
+else
+    exec /usr/bin/s6-svscan /app/gogs/docker/s6/
+fi