m5x2 #2

Merged
smf merged 32 commits from m5x2 into local 2024-03-08 18:15:54 +08:00
Showing only changes of commit 0c81dda880 - Show all commits

View File

@@ -62,7 +62,7 @@ DEPLOYMENT_COMMAND_OPTIONS=""
if [ "$INPUT_COPY_STACK_FILE" == "true" ]; then if [ "$INPUT_COPY_STACK_FILE" == "true" ]; then
STACK_FILE="$INPUT_DEPLOY_PATH/$STACK_FILE" STACK_FILE="$INPUT_DEPLOY_PATH/$STACK_FILE"
else else
DEPLOYMENT_COMMAND_OPTIONS=" --host ssh://$INPUT_REMOTE_DOCKER_HOST:$INPUT_REMOTE_DOCKER_PORT" DEPLOYMENT_COMMAND_OPTIONS=" --log-level debug --host ssh://$INPUT_REMOTE_DOCKER_HOST:$INPUT_REMOTE_DOCKER_PORT"
fi fi
case $INPUT_DEPLOYMENT_MODE in case $INPUT_DEPLOYMENT_MODE in
@@ -73,7 +73,8 @@ case $INPUT_DEPLOYMENT_MODE in
*) *)
INPUT_DEPLOYMENT_MODE="docker-compose" INPUT_DEPLOYMENT_MODE="docker-compose"
DEPLOYMENT_COMMAND="docker --log-level=debug compose -f $STACK_FILE $DEPLOYMENT_COMMAND_OPTIONS" # DEPLOYMENT_COMMAND="docker compose -f $STACK_FILE $DEPLOYMENT_COMMAND_OPTIONS"
DEPLOYMENT_COMMAND="docker --log-level=debug compose -f $STACK_FILE"
;; ;;
esac esac