diff options
author | Óscar García Amor <ogarcia@connectical.com> | 2015-10-02 21:18:13 +0200 |
---|---|---|
committer | Óscar García Amor <ogarcia@connectical.com> | 2015-10-02 21:18:13 +0200 |
commit | 3e7d8db7a2f52fcbe3e4a863d29d10eee90e2ff8 (patch) | |
tree | b5b4c159e97ea6e6f40d48127fc21dc34103ca08 /docker/s6 | |
parent | 655b69cb1f7804462f9ce50314446d00bebbf345 (diff) | |
download | gitea-3e7d8db7a2f52fcbe3e4a863d29d10eee90e2ff8.tar.gz gitea-3e7d8db7a2f52fcbe3e4a863d29d10eee90e2ff8.zip |
Several bugfixes in Docker build
- Removed unnecessary variables
- Fixed symbolic links creation
- Fixed enter point
- Less intermediate containers
Diffstat (limited to 'docker/s6')
-rwxr-xr-x | docker/s6/gogs/run | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/docker/s6/gogs/run b/docker/s6/gogs/run index a7b4cc55ee..626012c218 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 |