Compare commits

..

2 Commits

Author SHA1 Message Date
6618dfbd1b Missed proxy.json file merge
Merge remote-tracking branch 'refs/remotes/origin/master'
2022-03-26 14:31:26 +00:00
ac7efbb918 Docker registry url mistype 2022-03-26 14:30:13 +00:00

View File

@@ -10,18 +10,20 @@
# Setup docker registry url path
if [[ ! -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
SETUP="'/setup'";
if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
SETUP="/setup";
else
SETUP="setup";
DOCKER_REGISTRY_URL="";
fi
service_exec="docker run --rm \
-w /services/ \
-v /etc/user/config/user.json:/etc/user/config/user.json:ro \
-v /etc/user/config/services/:/services/:ro \
-v /etc/user/config/services/tmp/:/services/tmp/:rw \
-v /var/run/docker.sock:/var/run/docker.sock \
-v /usr/bin/docker:/usr/bin/docker:ro $DOCKER_REGISTRY_URL$SETUP /scripts/service-exec"
-v /usr/bin/docker:/usr/bin/docker:ro $DOCKER_REGISTRY_URL$SETUP "
letsencrypt_certificates() {