From 5b1e185867280b522c849069c9a211b9dc07b7d2 Mon Sep 17 00:00:00 2001 From: smf Date: Mon, 11 Mar 2024 14:08:05 +0800 Subject: [PATCH] add pull param --- action.yml | 2 ++ docker-entrypoint.sh | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index b62d4ce..008ca87 100644 --- a/action.yml +++ b/action.yml @@ -35,6 +35,8 @@ inputs: pre_deployment_command_args: description: The args for the pre deploument command. required: false + pull_images_first: + description: Pull docker images before deploying. Default is false. docker_registry_username: description: The docker registry username. required: false diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 5d82d65..e5b8520 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -81,7 +81,7 @@ if ! [ -z "${INPUT_DOCKER_REGISTRY_USERNAME+x}" ] && ! [ -z "$INPUT_DOCKER_REGIS fi if ! [ -z "${INPUT_DOCKER_PRUNE+x}" ] && [ $INPUT_DOCKER_PRUNE = 'true' ] ; then - yes | docker --log-level debug --host "ssh://$INPUT_REMOTE_DOCKER_HOST:$INPUT_REMOTE_DOCKER_PORT" system prune -a 2>&1 + yes | docker --log-level debug system prune -a 2>&1 fi DEPLOYMENT_COMMAND="docker --log-level=debug compose" @@ -94,6 +94,11 @@ if ! [ -z "${INPUT_ENV_FILE_NAME+x}" ] && ! [ -z "$INPUT_ENV_FILE_NAME" ]; then DEPLOYMENT_COMMAND="$DEPLOYMENT_COMMAND --env-file ${INPUT_ENV_FILE_NAME//,/ --env-file }" fi +if ! [ -z "${INPUT_PULL_IMAGES_FIRST+x}" ] && [ $INPUT_PULL_IMAGES_FIRST = 'true' ] ; then + echo "Connecting to $INPUT_REMOTE_DOCKER_HOST... Command: ${DEPLOYMENT_COMMAND} pull" + ${DEPLOYMENT_COMMAND} "pull" +fi + # DEPLOYMENT_COMMAND_OPTIONS="" echo "Connecting to $INPUT_REMOTE_DOCKER_HOST... Command: ${DEPLOYMENT_COMMAND} ${INPUT_ARGS}"