aboutsummaryrefslogtreecommitdiffstats
path: root/docker/s6
diff options
context:
space:
mode:
authorThomas Boerger <tboerger@suse.de>2016-11-28 14:13:18 +0100
committerThomas Boerger <tboerger@suse.de>2016-11-28 14:13:18 +0100
commit86aa8e413acc1dbcc7760cb220a6ee2126e926b6 (patch)
tree9ed7aef2aa3c3306fdcb359d557e211c5f65f111 /docker/s6
parentbf8d90c5cc6bea9ec4eeb2e827d10cd247043fe0 (diff)
downloadgitea-86aa8e413acc1dbcc7760cb220a6ee2126e926b6.tar.gz
gitea-86aa8e413acc1dbcc7760cb220a6ee2126e926b6.zip
Restructured docker building
I have restructured the docker build process entirely, the binary gets built outside of the docker build command, now we are managing all dependencies with real Alpine packages and I have dropped features like socat or the cron daemon. Signed-off-by: Thomas Boerger <tboerger@suse.de>
Diffstat (limited to 'docker/s6')
-rwxr-xr-xdocker/s6/.s6-svscan/finish5
-rw-r--r--docker/s6/crond/down0
-rwxr-xr-xdocker/s6/crond/run9
-rwxr-xr-xdocker/s6/gogs/run8
-rwxr-xr-xdocker/s6/gogs/setup23
-rwxr-xr-xdocker/s6/openssh/run7
-rwxr-xr-xdocker/s6/openssh/setup23
-rwxr-xr-xdocker/s6/syslogd/run7
8 files changed, 0 insertions, 82 deletions
diff --git a/docker/s6/.s6-svscan/finish b/docker/s6/.s6-svscan/finish
deleted file mode 100755
index 3fab7f42e5..0000000000
--- a/docker/s6/.s6-svscan/finish
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Cleanup SOCAT services and s6 event folder
-rm -rf $(find /app/gogs/docker/s6/ -name 'event')
-rm -rf /app/gogs/docker/s6/SOCAT_*
diff --git a/docker/s6/crond/down b/docker/s6/crond/down
deleted file mode 100644
index e69de29bb2..0000000000
--- a/docker/s6/crond/down
+++ /dev/null
diff --git a/docker/s6/crond/run b/docker/s6/crond/run
deleted file mode 100755
index 9aa9fb9f27..0000000000
--- a/docker/s6/crond/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# Crontabs are located by default in /var/spool/cron/crontabs/
-# The default configuration is also calling all the scripts in /etc/periodic/${period}
-
-if test -f ./setup; then
- source ./setup
-fi
-
-exec gosu root /usr/sbin/crond -fS
diff --git a/docker/s6/gogs/run b/docker/s6/gogs/run
deleted file mode 100755
index 1aa70eb41d..0000000000
--- a/docker/s6/gogs/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if test -f ./setup; then
- source ./setup
-fi
-
-export USER=git
-exec gosu $USER /app/gogs/gogs web
diff --git a/docker/s6/gogs/setup b/docker/s6/gogs/setup
deleted file mode 100755
index 8435e25b6b..0000000000
--- a/docker/s6/gogs/setup
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-if ! test -d ~git/.ssh; then
- mkdir -p ~git/.ssh
- chmod 700 ~git/.ssh
-fi
-
-if ! test -f ~git/.ssh/environment; then
- echo "GITEA_CUSTOM=${GITEA_CUSTOM}" > ~git/.ssh/environment
- chmod 600 ~git/.ssh/environment
-fi
-
-cd /app/gogs
-
-# Link volumed data with app data
-ln -sf /data/gogs/log ./log
-ln -sf /data/gogs/data ./data
-
-# Backward Compatibility with Gogs Container v0.6.15
-ln -sf /data/git /home/git
-
-chown -R git:git /data /app/gogs ~git/
-chmod 0755 /data /data/gogs ~git/
diff --git a/docker/s6/openssh/run b/docker/s6/openssh/run
deleted file mode 100755
index 99172aab69..0000000000
--- a/docker/s6/openssh/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if test -f ./setup; then
- source ./setup
-fi
-
-exec gosu root /usr/sbin/sshd -D -f /app/gogs/docker/sshd_config
diff --git a/docker/s6/openssh/setup b/docker/s6/openssh/setup
deleted file mode 100755
index 5333d3c06e..0000000000
--- a/docker/s6/openssh/setup
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Check if host keys are present, else create them
-if ! test -f /data/ssh/ssh_host_rsa_key; then
- ssh-keygen -q -f /data/ssh/ssh_host_rsa_key -N '' -t rsa
-fi
-
-if ! test -f /data/ssh/ssh_host_dsa_key; then
- ssh-keygen -q -f /data/ssh/ssh_host_dsa_key -N '' -t dsa
-fi
-
-if ! test -f /data/ssh/ssh_host_ecdsa_key; then
- ssh-keygen -q -f /data/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
-fi
-
-if ! test -f /data/ssh/ssh_host_ed25519_key; then
- ssh-keygen -q -f /data/ssh/ssh_host_ed25519_key -N '' -t ed25519
-fi
-
-# Set correct right to ssh keys
-chown -R root:root /data/ssh/*
-chmod 0700 /data/ssh
-chmod 0600 /data/ssh/*
diff --git a/docker/s6/syslogd/run b/docker/s6/syslogd/run
deleted file mode 100755
index f7bdbe36d6..0000000000
--- a/docker/s6/syslogd/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if test -f ./setup; then
- source ./setup
-fi
-
-exec gosu root /sbin/syslogd -nS -O-