From 3e7d8db7a2f52fcbe3e4a863d29d10eee90e2ff8 Mon Sep 17 00:00:00 2001 From: Óscar García Amor Date: Fri, 2 Oct 2015 21:18:13 +0200 Subject: Several bugfixes in Docker build - Removed unnecessary variables - Fixed symbolic links creation - Fixed enter point - Less intermediate containers --- docker/s6/gogs/run | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'docker/s6/gogs') diff --git a/docker/s6/gogs/run b/docker/s6/gogs/run index a7b4cc55..626012c2 100755 --- a/docker/s6/gogs/run +++ b/docker/s6/gogs/run @@ -1,6 +1,5 @@ #!/bin/sh USER=git -USERNAME=$USER if ! test -d /data/gogs; then mkdir -p /data/gogs/data /data/gogs/conf /data/gogs/log /data/git @@ -12,17 +11,16 @@ if ! test -d ~git/.ssh; then fi if ! test -f ~git/.ssh/environment; then - echo "GOGS_CUSTOM=/data/gogs" > ~git/.ssh/environment - chown git:git ~git/.ssh/environment - chown 600 ~git/.ssh/environment + echo "GOGS_CUSTOM=${GOGS_CUSTOM}" > ~git/.ssh/environment + chmod 600 ~git/.ssh/environment fi -ln -sf /data/gogs/log /app/gogs/log -ln -sf /data/gogs/data /app/gogs/data -ln -sf /data/gogs/conf /app/gogs/conf +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 -export USERNAME exec gosu $USER /app/gogs/gogs web -- cgit v1.2.3