Added letsencrypt additional values
This commit is contained in:
@@ -29,15 +29,42 @@ if [ "$SERVICE_FILES" == "" ]; then
|
|||||||
SERVICE_FILES=/etc/user/config/services
|
SERVICE_FILES=/etc/user/config/services
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$SOURCE" == "" ]; then
|
||||||
|
SOURCE=/etc/user/config
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
|
||||||
|
SETUP="/setup";
|
||||||
|
else
|
||||||
|
SETUP="setup";
|
||||||
|
DOCKER_REGISTRY_URL="";
|
||||||
|
fi
|
||||||
|
|
||||||
|
DNS_DIR="/etc/system/data/dns";
|
||||||
|
DNS="--env DNS_DIR=$DNS_DIR";
|
||||||
|
DNS_PATH="--volume $DNS_DIR:/etc/dns:rw";
|
||||||
|
|
||||||
|
CA_PATH=/etc/ssl/certs;
|
||||||
|
CA="--env CA_PATH=$CA_PATH";
|
||||||
|
CA_FILE="--volume $CA_PATH:$CA_PATH:ro";
|
||||||
|
|
||||||
|
|
||||||
service_exec="docker run --rm \
|
service_exec="docker run --rm \
|
||||||
-w /services/ \
|
$DNS $DNS_PATH \
|
||||||
-v $SERVICE_FILES/:/services/:ro \
|
$CA $CA_FILE \
|
||||||
-v $SERVICE_FILES/tmp/:/services/tmp/:rw \
|
-w /services/ \
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
-v $SOURCE/system.json:/etc/user/config/system.json:ro \
|
||||||
-v /usr/bin/docker:/usr/bin/docker:ro \
|
-v $SOURCE/user.json:/etc/user/config/user.json:ro \
|
||||||
--env TIMEOUT=$TIMEOUT \
|
-v $SERVICE_FILES/:/services/:ro \
|
||||||
--env RESTART=$RESTART \
|
-v $SERVICE_FILES/tmp/:/services/tmp/:rw \
|
||||||
--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL $DOCKER_REGISTRY_URL$SETUP"
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
|
-v /usr/bin/docker:/usr/bin/docker:ro \
|
||||||
|
--env DOMAIN=$DOMAIN \
|
||||||
|
--env TIMEOUT=$TIMEOUT \
|
||||||
|
--env RESTART=$RESTART \
|
||||||
|
--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
|
||||||
|
$DOCKER_REGISTRY_URL$SETUP"
|
||||||
|
|
||||||
|
|
||||||
letsencrypt_certificates() {
|
letsencrypt_certificates() {
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user