fix
This commit is contained in:
@@ -78,7 +78,8 @@ echo "Create docker context"
|
|||||||
docker context create remote --docker "host=ssh://REMOTE_DOCKER_HOST"
|
docker context create remote --docker "host=ssh://REMOTE_DOCKER_HOST"
|
||||||
docker context use remote
|
docker context use remote
|
||||||
|
|
||||||
if ! [ "x${INPUT_DOCKER_REGISTRY_USERNAME}"=="x" ] && ! [ "x${INPUT_DOCKER_REGISTRY_PASSWORD}"=="x" ]; then
|
if ! [ -z "${INPUT_DOCKER_REGISTRY_USERNAME+x}" ] && ! [ -z "$INPUT_DOCKER_REGISTRY_USERNAME" ] &&
|
||||||
|
! [ -z "${INPUT_DOCKER_REGISTRY_PASSWORD+x}" ] && ! [ -z "$INPUT_DOCKER_REGISTRY_PASSWORD" ]; then
|
||||||
echo "Connecting to $INPUT_DOCKER_REGISTRY_URI... Command: docker login"
|
echo "Connecting to $INPUT_DOCKER_REGISTRY_URI... Command: docker login"
|
||||||
echo "$INPUT_DOCKER_REGISTRY_PASSWORD" | docker login -u "$INPUT_DOCKER_REGISTRY_USERNAME" --password-stdin "$INPUT_DOCKER_REGISTRY_URI"
|
echo "$INPUT_DOCKER_REGISTRY_PASSWORD" | docker login -u "$INPUT_DOCKER_REGISTRY_USERNAME" --password-stdin "$INPUT_DOCKER_REGISTRY_URI"
|
||||||
fi
|
fi
|
||||||
@@ -89,11 +90,11 @@ fi
|
|||||||
|
|
||||||
DEPLOYMENT_COMMAND="docker --log-level=debug compose"
|
DEPLOYMENT_COMMAND="docker --log-level=debug compose"
|
||||||
|
|
||||||
if ! [ "x${INPUT_STACK_FILE_NAME}"=="x" ]; then
|
if ! [ -z "${INPUT_STACK_FILE_NAME+x}" ] && ! [ -z "$INPUT_STACK_FILE_NAME" ]; then
|
||||||
DEPLOYMENT_COMMAND="$DEPLOYMENT_COMMAND -f ${INPUT_STACK_FILE_NAME//,/ -f }"
|
DEPLOYMENT_COMMAND="$DEPLOYMENT_COMMAND -f ${INPUT_STACK_FILE_NAME//,/ -f }"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [ "x${INPUT_ENV_FILE_NAME}"=="x" ]; then
|
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 }"
|
DEPLOYMENT_COMMAND="$DEPLOYMENT_COMMAND --env-file ${INPUT_ENV_FILE_NAME//,/ --env-file }"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user