From 49e8128b8c9c157f1bc139cfc00692a55b28ff69 Mon Sep 17 00:00:00 2001
From: smf <s.m.f@qq.com>
Date: Fri, 8 Mar 2024 17:50:45 +0800
Subject: [PATCH] fix

---
 docker-entrypoint.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 418eceb..7f21a7d 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -78,7 +78,8 @@ echo "Create docker context"
 docker context create remote --docker "host=ssh://REMOTE_DOCKER_HOST"
 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 "$INPUT_DOCKER_REGISTRY_PASSWORD" | docker login -u "$INPUT_DOCKER_REGISTRY_USERNAME" --password-stdin "$INPUT_DOCKER_REGISTRY_URI"
 fi
@@ -89,11 +90,11 @@ fi
 
 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 }"
 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 }"
 fi