safebox/proxy-scheduler
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Setup docker registry url variable.

Browse Source
This commit is contained in:
Gyorgy Berenyi
2021-10-08 07:24:15 +02:00
parent 7e97be1f9c
commit 966ab57278
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/check_certificates.sh
View File

@@ -2,16 +2,26 @@
# Set env variables # Set env variables
DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL
LETSENCRYPT_URL=$LETSENCRYPT_URL LETSENCRYPT_URL=$LETSENCRYPT_URL
DOMAIN_DIR=$DOMAIN_DIR DOMAIN_DIR=$DOMAIN_DIR
DOMAIN=$1 DOMAIN=$1
DOMAIN_CERT_DIR=$CERT_DIR/$DOMAIN 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 \ service_exec="docker run --rm \
-v /etc/user/config/user.json:/etc/user/config/user.json:ro \ -v /etc/user/config/user.json:/etc/user/config/user.json:ro \
-v /etc/user/config/services/:/services/:ro \ -v /etc/user/config/services/:/services/:ro \
-v /var/run/docker.sock:/var/run/docker.sock \ -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() { letsencrypt_certificates() {

11
scripts/check_proxy_state.sh
View File

@@ -1,8 +1,10 @@
# Initial parameters # Initial parameters
DATE=`date +%F-%H-%M-%S` DATE=`date +%F-%H-%M-%S`
TIMEOUT=$TIMEOUT TIMEOUT=$TIMEOUT
RESTART=$RESTART RESTART=$RESTART
RESTART_COUNTER=0 RESTART_COUNTER=0
DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL
# Set env variables # Set env variables
DOMAIN="$1" DOMAIN="$1"
@@ -11,6 +13,15 @@ ROLE=$ROLE
SERVICE_NAME=$SERVICE_NAME SERVICE_NAME=$SERVICE_NAME
PROXY_CONFIG_DIR=$PROXY_CONFIG_DIR 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" 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() { do_proxy_restart() {