From fdee458660abde29e5c3f47ad127e17d19a2dfdf Mon Sep 17 00:00:00 2001 From: smf Date: Fri, 8 Mar 2024 16:00:54 +0800 Subject: [PATCH] fix --- docker-entrypoint.sh | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 05845a9..9dc2ea9 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -25,11 +25,7 @@ if [ -z "${INPUT_ARGS+x}" ]; then exit 1 fi -CHANGE_DIR=true -if [ -z "${INPUT_DEPLOY_PATH+x}" ]; then - CHANGE_DIR=false -fi -if $CHANGE_DIR ; then +if [ $INPUT_DEPLOY_PATH ]; then echo "Change working directory" echo "Current: `pwd`" echo "Target: $INPUT_DEPLOY_PATH" @@ -52,10 +48,6 @@ chmod 600 ~/.ssh/id_rsa eval $(ssh-agent) ssh-add ~/.ssh/id_rsa -SSH_PROXY=true -if [ -z "${INPUT_SSH_PROXY_CMD+x}" ]; then - SSH_PROXY=false -fi echo "Add REMOTE_DOCKER_HOST alias to ~/.ssh/config" touch ~/.ssh/config echo >> ~/.ssh/config @@ -66,7 +58,7 @@ echo " Port $INPUT_REMOTE_DOCKER_PORT" >> ~/.ssh/config echo " IdentityFile ~/.ssh/id_rsa" >> ~/.ssh/config echo " StrictHostKeyChecking no" >> ~/.ssh/config echo " UserKnownHostsFile /dev/null" >> ~/.ssh/config -if $SSH_PROXY ; then +if [ $INPUT_SSH_PROXY_CMD ]; then echo "Add ProxyCommand: $INPUT_SSH_PROXY_CMD" echo " ProxyCommand $INPUT_SSH_PROXY_CMD" >> ~/.ssh/config fi @@ -83,25 +75,17 @@ if [ $INPUT_DOCKER_REGISTRY_USERNAME ] && [ $INPUT_DOCKER_REGISTRY_PASSWORD ]; t echo "$INPUT_DOCKER_REGISTRY_PASSWORD" | docker login -u "$INPUT_DOCKER_REGISTRY_USERNAME" --password-stdin "$INPUT_DOCKER_REGISTRY_URI" fi -if ! [ -z "${INPUT_DOCKER_PRUNE+x}" ] && [ $INPUT_DOCKER_PRUNE = 'true' ] ; then +if [ $INPUT_DOCKER_PRUNE ] && [ $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 fi DEPLOYMENT_COMMAND="docker --log-level=debug compose" -STACK_FILE=true -if [ -z "${INPUT_STACK_FILE_NAME+x}" ]; then - STACK_FILE=false -fi -if $STACK_FILE ; then +if [ $INPUT_STACK_FILE_NAME ]; then DEPLOYMENT_COMMAND="$DEPLOYMENT_COMMAND -f ${INPUT_STACK_FILE_NAME//,/ -f }" fi -ENV_FILE=true -if [ -z "${INPUT_ENV_FILE_NAME+x}" ]; then - ENV_FILE=false -fi -if $ENV_FILE ; then +if [ $INPUT_ENV_FILE_NAME ]; then DEPLOYMENT_COMMAND="$DEPLOYMENT_COMMAND --env-file ${INPUT_ENV_FILE_NAME//,/ --env-file }" fi