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

Added multiple arrays into temporary service file

Browse Source
This commit is contained in:
Gyorgy Berenyi
2023-06-13 09:01:21 +00:00
parent fd3d8cf1db
commit 23beab8a6d
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/check_certificates.sh
View File

@@ -55,12 +55,9 @@ $CA $CA_FILE \
-w /services/ \ -w /services/ \
-v $SOURCE/system.json:/etc/user/config/system.json:ro \ -v $SOURCE/system.json:/etc/user/config/system.json:ro \
-v $SOURCE/user.json:/etc/user/config/user.json:ro \ -v $SOURCE/user.json:/etc/user/config/user.json:ro \
-v $SERVICE_FILES/tmp/:/services/:ro \ -v $SERVICE_FILES/:/services/tmp/:rw \
-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 \ -v /usr/bin/docker:/usr/bin/docker:ro \
--env DOMAIN=$DOMAIN \
--env TIMEOUT=$TIMEOUT \
--env RESTART=$RESTART \
--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \ --env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
$DOCKER_REGISTRY_URL$SETUP" $DOCKER_REGISTRY_URL$SETUP"
@@ -75,14 +72,20 @@ letsencrypt_certificates() {
LETS_ENCRYPT_VALUE="$(docker ps | grep letsencrypt | grep Up | wc -l)"; LETS_ENCRYPT_VALUE="$(docker ps | grep letsencrypt | grep Up | wc -l)";
if [[ $LETS_ENCRYPT_VALUE -eq 0 ]] ; then if [[ $LETS_ENCRYPT_VALUE -eq 0 ]] ; then
echo "Starting letsencrypt process"; echo "Starting letsencrypt process";
LETSENCRYPT_TEMP_SERVICE_FILE=$(mktemp -p /tmp/); LETSENCRYPT_TEMP_SERVICE_FILE=$(mktemp -p /tmp/)".json";
ENVS='[ ENVS='[
{"DOMAIN": "'$DOMAIN'"}, {"DOMAIN": "'$DOMAIN'"},
{"TIMEOUT": "'$TIMEOUT'"}, {"TIMEOUT": "'$TIMEOUT'"},
{"RESTART": "'$RESTART'"} {"RESTART": "'$RESTART'"}
]'; ]';
jq '.containers[0].ENVS |='"$ENVS" $SERVICE_FILES/$LETSENCRYPT_SERVICE_NAME > $LETSENCRYPT_TEMP_SERVICE_FILE VOLUMES='
{
"SOURCE": "/etc/user/config/user.json",
"DEST": "/etc/user/config/user.json",
"TYPE": "ro"
}
';
jq '.containers[0].ENVS |='"$ENVS"' | .containers[0].VOLUMES[.containers[0].VOLUMES|length]|='"$VOLUMES" $SERVICE_FILES/$LETSENCRYPT_SERVICE_NAME > $LETSENCRYPT_TEMP_SERVICE_FILE;
$service_exec $(basename $LETSENCRYPT_TEMP_SERVICE_FILE) start info; $service_exec $(basename $LETSENCRYPT_TEMP_SERVICE_FILE) start info;
break; break;
else else