mirror of
https://github.com/go-gitea/gitea
synced 2024-12-23 09:04:26 +00:00
Merge pull request #1764 from 0rax/develop
Volumed data setup changed to allow #1759
This commit is contained in:
commit
575300cd57
@ -1,11 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/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
|
if ! test -d ~git/.ssh; then
|
||||||
mkdir ~git/.ssh
|
mkdir -p ~git/.ssh
|
||||||
chmod 700 ~git/.ssh
|
chmod 700 ~git/.ssh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -1,12 +1,26 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
if ! test -d /data/ssh; then
|
# Check if host keys are present, else create them
|
||||||
mkdir -p /data/ssh
|
if ! test -d /data/ssh/ssh_host_key; then
|
||||||
ssh-keygen -q -f /data/ssh/ssh_host_key -N '' -t rsa1
|
ssh-keygen -q -f /data/ssh/ssh_host_key -N '' -t rsa1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! test -d /data/ssh/ssh_host_rsa_key; then
|
||||||
ssh-keygen -q -f /data/ssh/ssh_host_rsa_key -N '' -t rsa
|
ssh-keygen -q -f /data/ssh/ssh_host_rsa_key -N '' -t rsa
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! test -d /data/ssh/ssh_host_dsa_key; then
|
||||||
ssh-keygen -q -f /data/ssh/ssh_host_dsa_key -N '' -t dsa
|
ssh-keygen -q -f /data/ssh/ssh_host_dsa_key -N '' -t dsa
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! test -d /data/ssh/ssh_host_ecdsa_key; then
|
||||||
ssh-keygen -q -f /data/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
|
ssh-keygen -q -f /data/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! test -d /data/ssh/ssh_host_ed25519_key; then
|
||||||
ssh-keygen -q -f /data/ssh/ssh_host_ed25519_key -N '' -t ed25519
|
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/*
|
chown -R root:root /data/ssh/*
|
||||||
chmod 600 /data/ssh/*
|
chmod 600 /data/ssh/*
|
||||||
fi
|
|
||||||
|
@ -5,6 +5,13 @@
|
|||||||
rm -rf $(find /app/gogs/docker/s6/ -name 'event')
|
rm -rf $(find /app/gogs/docker/s6/ -name 'event')
|
||||||
rm -rf /app/gogs/docker/s6/SOCAT_*
|
rm -rf /app/gogs/docker/s6/SOCAT_*
|
||||||
|
|
||||||
|
# Create VOLUME subfolder
|
||||||
|
for f in /data/gogs/data /data/gogs/conf /data/gogs/log /data/git /data/ssh; do
|
||||||
|
if ! test -d $f; then
|
||||||
|
mkdir -p $f
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
# Bind linked docker container to localhost socket using socat
|
# Bind linked docker container to localhost socket using socat
|
||||||
env | sed -En 's|(.*)_PORT_([0-9]*)_TCP=tcp://(.*):(.*)|\1_\2 socat -ls TCP4-LISTEN:\2,fork,reuseaddr TCP4:\3:\4|p' | \
|
env | sed -En 's|(.*)_PORT_([0-9]*)_TCP=tcp://(.*):(.*)|\1_\2 socat -ls TCP4-LISTEN:\2,fork,reuseaddr TCP4:\3:\4|p' | \
|
||||||
while read NAME CMD; do
|
while read NAME CMD; do
|
||||||
|
Loading…
Reference in New Issue
Block a user