diff --git a/scripts/check_certificates.sh b/scripts/check_certificates.sh index 9baf5d6..4ba200a 100755 --- a/scripts/check_certificates.sh +++ b/scripts/check_certificates.sh @@ -2,16 +2,26 @@ # Set env variables + DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL LETSENCRYPT_URL=$LETSENCRYPT_URL DOMAIN_DIR=$DOMAIN_DIR DOMAIN=$1 DOMAIN_CERT_DIR=$CERT_DIR/$DOMAIN +# Setup docker registry url path + +if [[ ! -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then + SETUP="'/setup'"; +else + SETUP="setup"; + $DOCKER_REGISTRY_URL=""; +fi + service_exec="docker run --rm \ -v /etc/user/config/user.json:/etc/user/config/user.json:ro \ -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" + -v /usr/bin/docker:/usr/bin/docker:ro $DOCKER_REGISTRY_URL$SETUP /scripts/service-exec" letsencrypt_certificates() { diff --git a/scripts/check_proxy_state.sh b/scripts/check_proxy_state.sh index d9e0664..621c9aa 100755 --- a/scripts/check_proxy_state.sh +++ b/scripts/check_proxy_state.sh @@ -1,8 +1,10 @@ # Initial parameters + DATE=`date +%F-%H-%M-%S` TIMEOUT=$TIMEOUT RESTART=$RESTART RESTART_COUNTER=0 +DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL # Set env variables DOMAIN="$1" @@ -11,6 +13,15 @@ ROLE=$ROLE SERVICE_NAME=$SERVICE_NAME PROXY_CONFIG_DIR=$PROXY_CONFIG_DIR +# Setup docker registry url path + +if [[ ! -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then + SETUP="'/setup'"; +else + SETUP="setup"; + $DOCKER_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" do_proxy_restart() {