Fixing if statement definitions.
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"proxy_scheduler": {
|
||||
"DOCKER_REGISTRY_URL": "registry.format.hu",
|
||||
"PROXY_TYPE": "",
|
||||
"LETSENCRYPT_URL": "letsencrypt.org",
|
||||
"CERT_DIR": "/keys",
|
||||
"DOMAIN_DIR": "/domains",
|
||||
|
@@ -4,7 +4,7 @@ DATE=`date +%F-%H-%M-%S`
|
||||
TIMEOUT=$TIMEOUT
|
||||
RESTART=$RESTART
|
||||
RESTART_COUNTER=0
|
||||
DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL
|
||||
REGISTRY_URL=$DOCKER_REGISTRY_URL
|
||||
|
||||
# Set env variables
|
||||
DOMAIN="$1"
|
||||
@@ -15,11 +15,11 @@ PROXY_CONFIG_DIR=$PROXY_CONFIG_DIR
|
||||
|
||||
# Setup docker registry url path
|
||||
|
||||
if [[ ! -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
|
||||
if [[ ! -n "$REGISTRY_URL" ]] && [[ "$REGISTRY_URL" != "null" ]] ; then
|
||||
SETUP="'/setup'";
|
||||
else
|
||||
SETUP="setup";
|
||||
$DOCKER_REGISTRY_URL="";
|
||||
$REGISTRY_URL="";
|
||||
fi
|
||||
|
||||
service_exec="docker run --rm -v /etc/user/config/services/:/services/:ro -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker:ro registry.format.hu/setup /scripts/service-exec"
|
||||
|
Reference in New Issue
Block a user