Compare commits

...

2 Commits

Author SHA1 Message Date
966ab57278 Setup docker registry url variable. 2021-10-08 07:24:15 +02:00
7e97be1f9c Added proxy.json enviroment parameters file. 2021-10-08 07:12:17 +02:00
3 changed files with 36 additions and 1 deletions

14
proxy.json Normal file
View File

@@ -0,0 +1,14 @@
{
"proxy_scheduler": {
"DOCKER_REGISTRY_URL": "registry.format.hu",
"LETSENCRYPT_URL": "letsencrypt.org",
"CERT_DIR": "/keys",
"DOMAIN_DIR": "/domains",
"PROXY_SERVICE_FILE": "public-proxy.json",
"PROXY_CONFIG_DIR": "/proxy_config",
"TIMEOUT": "5",
"RESTART": "3",
"ROLE": "backend-proxy",
"SERVICE_NAME": "public-proxy"
}
}

View File

@@ -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() {

View File

@@ -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() {