SETUP_VERSION
This commit is contained in:
@@ -14,17 +14,9 @@
|
|||||||
TIMEOUT=$TIMEOUT
|
TIMEOUT=$TIMEOUT
|
||||||
RESTART=$RESTART
|
RESTART=$RESTART
|
||||||
|
|
||||||
# Setup docker registry url path
|
SETUP_VERSION=${SETUP_VERSION:-latest};
|
||||||
|
|
||||||
if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
|
|
||||||
SETUP="/setup";
|
|
||||||
else
|
|
||||||
SETUP="setup";
|
|
||||||
DOCKER_REGISTRY_URL="";
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Setting service files path
|
# Setting service files path
|
||||||
|
|
||||||
if [ "$SERVICE_FILES" == "" ]; then
|
if [ "$SERVICE_FILES" == "" ]; then
|
||||||
SERVICE_FILES=/etc/user/config/services
|
SERVICE_FILES=/etc/user/config/services
|
||||||
fi
|
fi
|
||||||
@@ -33,6 +25,7 @@ if [ "$SOURCE" == "" ]; then
|
|||||||
SOURCE=/etc/user/config
|
SOURCE=/etc/user/config
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Setup docker registry url path
|
||||||
if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
|
if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
|
||||||
SETUP="/setup";
|
SETUP="/setup";
|
||||||
else
|
else
|
||||||
@@ -49,7 +42,7 @@ service_exec="docker run --rm \
|
|||||||
--mount src=USER_CONFIG,dst=/etc/user/config/user.json,volume-subpath=user.json,ro \
|
--mount src=USER_CONFIG,dst=/etc/user/config/user.json,volume-subpath=user.json,ro \
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
|
--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
|
||||||
$DOCKER_REGISTRY_URL$SETUP"
|
$DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
|
||||||
|
|
||||||
letsencrypt_certificates() {
|
letsencrypt_certificates() {
|
||||||
|
|
||||||
|
@@ -20,6 +20,7 @@ ROLE=$ROLE
|
|||||||
SERVICE_NAME=$SERVICE_NAME
|
SERVICE_NAME=$SERVICE_NAME
|
||||||
PROXY_CONFIG_DIR=$PROXY_CONFIG_DIR
|
PROXY_CONFIG_DIR=$PROXY_CONFIG_DIR
|
||||||
|
|
||||||
|
SETUP_VERSION=${SETUP_VERSION:-latest};
|
||||||
|
|
||||||
# Setup docker registry url path
|
# Setup docker registry url path
|
||||||
|
|
||||||
@@ -77,7 +78,7 @@ service_exec="docker run --rm \
|
|||||||
-v /etc/user/config/services/tmp/:/services/tmp/:rw \
|
-v /etc/user/config/services/tmp/:/services/tmp/:rw \
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
|
--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
|
||||||
$DOCKER_REGISTRY_URL$SETUP"
|
$DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
|
||||||
|
|
||||||
do_proxy_restart() {
|
do_proxy_restart() {
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user