Enhance entrypoint script with debug mode and Docker registry environment variables
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -2,6 +2,15 @@
|
|||||||
|
|
||||||
cd /scripts
|
cd /scripts
|
||||||
DEBUG_MODE=${DEBUG_MODE:-false}
|
DEBUG_MODE=${DEBUG_MODE:-false}
|
||||||
|
|
||||||
|
if [ "$DEBUG_MODE" == "true" ]; then
|
||||||
|
DOCKER_START="--entrypoint=sh $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c 'sleep 86400'"
|
||||||
|
SET_DEBUG_MODE="--env DEBUG_MODE=true"
|
||||||
|
else
|
||||||
|
DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
|
||||||
|
SET_DEBUG_MODE=""
|
||||||
|
fi
|
||||||
|
|
||||||
VERSION=1.1.1
|
VERSION=1.1.1
|
||||||
|
|
||||||
#DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu}
|
#DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu}
|
||||||
@@ -12,10 +21,13 @@ DOCKER_REGISTRY_PASSWORD=$DOCKER_REGISTRY_PASSWORD
|
|||||||
if [ -n "$DOCKER_REGISTRY_USERNAME" ] && [ -n "$DOCKER_REGISTRY_PASSWORD" ]; then
|
if [ -n "$DOCKER_REGISTRY_USERNAME" ] && [ -n "$DOCKER_REGISTRY_PASSWORD" ]; then
|
||||||
echo "Logging in to Docker registry $DOCKER_REGISTRY_URL"
|
echo "Logging in to Docker registry $DOCKER_REGISTRY_URL"
|
||||||
echo "$DOCKER_REGISTRY_PASSWORD" | docker login $DOCKER_REGISTRY_URL --username $DOCKER_REGISTRY_USERNAME --password-stdin
|
echo "$DOCKER_REGISTRY_PASSWORD" | docker login $DOCKER_REGISTRY_URL --username $DOCKER_REGISTRY_USERNAME --password-stdin
|
||||||
|
DOCKER_REGISTRY_ENVS="--env DOCKER_REGISTRY_USERNAME=$DOCKER_REGISTRY_USERNAME --env DOCKER_REGISTRY_PASSWORD=$DOCKER_REGISTRY_PASSWORD"
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "No Docker registry credentials provided, skipping login."
|
echo "No Docker registry credentials provided, skipping login."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
USER_INIT_PATH=$USER_INIT_PATH
|
USER_INIT_PATH=$USER_INIT_PATH
|
||||||
GLOBAL_VERSION=${GLOBAL_VERSION:-latest}
|
GLOBAL_VERSION=${GLOBAL_VERSION:-latest}
|
||||||
SERVICE_DIR=${SERVICE_DIR:-/etc/user/config/services}
|
SERVICE_DIR=${SERVICE_DIR:-/etc/user/config/services}
|
||||||
@@ -91,6 +103,8 @@ $VOLUME_MOUNTS \
|
|||||||
--env SETUP_VERSION=$SETUP_VERSION \
|
--env SETUP_VERSION=$SETUP_VERSION \
|
||||||
--env GLOBAL_VERSION=$GLOBAL_VERSION \
|
--env GLOBAL_VERSION=$GLOBAL_VERSION \
|
||||||
--env HOST_FILE=$HOST_FILE \
|
--env HOST_FILE=$HOST_FILE \
|
||||||
|
$SET_DEBUG_MODE \
|
||||||
|
$DOCKER_REGISTRY_ENVS \
|
||||||
$DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
|
$DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
|
||||||
|
|
||||||
DEBUG=1
|
DEBUG=1
|
||||||
@@ -879,20 +893,6 @@ upgrade_scheduler() {
|
|||||||
debug "Upgrading framework scheduler..."
|
debug "Upgrading framework scheduler..."
|
||||||
/usr/bin/docker pull "$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
|
/usr/bin/docker pull "$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
|
||||||
|
|
||||||
if [ "$DEBUG_MODE" == "true" ]; then
|
|
||||||
DOCKER_START="--entrypoint=sh $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c 'sleep 86400'"
|
|
||||||
SET_DEBUG_MODE="--env DEBUG_MODE=true"
|
|
||||||
else
|
|
||||||
DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
|
|
||||||
SET_DEBUG_MODE=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "$DOCKER_REGISTRY_USERNAME"] && [ -n "$DOCKER_REGISTRY_PASSWORD" ]; then
|
|
||||||
DOCKER_REGISTRY_ENVS="--env DOCKER_REGISTRY_USERNAME=$DOCKER_REGISTRY_USERNAME --env DOCKER_REGISTRY_PASSWORD=$DOCKER_REGISTRY_PASSWORD"
|
|
||||||
else
|
|
||||||
DOCKER_REGISTRY_ENVS=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
FRAMEWORK_SCHEDULER_NAME="$FRAMEWORK_SCHEDULER_NAME-$(head /dev/urandom | tr -dc '0-9' | head -c 6)"
|
FRAMEWORK_SCHEDULER_NAME="$FRAMEWORK_SCHEDULER_NAME-$(head /dev/urandom | tr -dc '0-9' | head -c 6)"
|
||||||
|
|
||||||
DOCKER_RUN="/usr/bin/docker run -d \
|
DOCKER_RUN="/usr/bin/docker run -d \
|
||||||
|
Reference in New Issue
Block a user