From 49f425f3762d3dc4cbbb25221a6e1b74a95c9c94 Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Tue, 10 Aug 2021 11:59:46 -0500 Subject: [PATCH 01/14] Update docker-entrypoint.sh Commit an outstanding Pull Req from original repo --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index adf9f6f..2c6f2a4 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -102,7 +102,7 @@ if ! [ -z "$INPUT_COPY_STACK_FILE" ] && [ $INPUT_COPY_STACK_FILE = 'true' ] ; th execute_ssh "ls -t $INPUT_DEPLOY_PATH/stacks/docker-stack-* 2>/dev/null | tail -n +$INPUT_KEEP_FILES | xargs rm -- 2>/dev/null || true" if ! [ -z "$INPUT_PULL_IMAGES_FIRST" ] && [ $INPUT_PULL_IMAGES_FIRST = 'true' ] && [ $INPUT_DEPLOYMENT_MODE = 'docker-compose' ] ; then - execute_ssh "${DEPLOYMENT_COMMAND} pull" + execute_ssh ${DEPLOYMENT_COMMAND} "pull" fi if ! [ -z "$INPUT_PRE_DEPLOYMENT_COMMAND_ARGS" ] && [ $INPUT_DEPLOYMENT_MODE = 'docker-compose' ] ; then From bc72c4cdec07cbc4e30877047103e18f2abd6beb Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Tue, 10 Aug 2021 12:02:04 -0500 Subject: [PATCH 02/14] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 428a1c2..217cb62 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: with: fetch-depth: 1 - name: Start Deployment - uses: wshihadeh/docker-deployment-action@master + uses: gonzalochief/docker-deployment-action@master with: remote_docker_host: ${{ secrets.HOST }} ssh_private_key: ${{ secrets.PRIVATE_KEY }} @@ -29,7 +29,7 @@ jobs: args: -p test up -d - name: Start Deployment without copy - uses: wshihadeh/docker-deployment-action@master + uses: gonzalochief/docker-deployment-action@master with: remote_docker_host: ${{ secrets.HOST }} ssh_private_key: ${{ secrets.PRIVATE_KEY }} From 1cb5b8974fe0f97e764fbf65e47f0f9c32e544c9 Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Thu, 14 Oct 2021 13:51:25 -0500 Subject: [PATCH 03/14] Update docker command to be compliant with v2.0.1 --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 2c6f2a4..858cc4c 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -65,7 +65,7 @@ case $INPUT_DEPLOYMENT_MODE in *) INPUT_DEPLOYMENT_MODE="docker-compose" - DEPLOYMENT_COMMAND="docker-compose $DEPLOYMENT_COMMAND_OPTIONS -f $STACK_FILE" + DEPLOYMENT_COMMAND="docker compose $DEPLOYMENT_COMMAND_OPTIONS -f $STACK_FILE" ;; esac From 45033bf279196cf2f6aad0be2b72ebec165ed338 Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Fri, 15 Oct 2021 10:33:29 -0500 Subject: [PATCH 04/14] Add version input Create the input to do a conditional later --- action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/action.yml b/action.yml index 01ae3bb..73bccbf 100644 --- a/action.yml +++ b/action.yml @@ -21,6 +21,9 @@ inputs: deployment_mode: description: Deployment mode either docker-swarm or docker-compose. Default is docker-compose. required: false + docker_compose_ver: + description: Sets docker compose version: v1 or v2. Default v2 + required: false copy_stack_file: description: Copy stack file to remote server and deploy from the server. Default is false. required: false From 7b9f5300b9961cf9264bf351e4c1fb5fb4fed456 Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Fri, 15 Oct 2021 10:35:51 -0500 Subject: [PATCH 05/14] set default --- action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/action.yml b/action.yml index 73bccbf..c37b6b2 100644 --- a/action.yml +++ b/action.yml @@ -24,6 +24,7 @@ inputs: docker_compose_ver: description: Sets docker compose version: v1 or v2. Default v2 required: false + default: 'v2' copy_stack_file: description: Copy stack file to remote server and deploy from the server. Default is false. required: false From e41364cb99763900685f385c875db95466e538f2 Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Fri, 15 Oct 2021 10:54:11 -0500 Subject: [PATCH 06/14] Allows to make v1 and v2 calls to compose --- docker-entrypoint.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 858cc4c..ac019b5 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -57,6 +57,13 @@ else DEPLOYMENT_COMMAND_OPTIONS=" --log-level debug --host ssh://$INPUT_REMOTE_DOCKER_HOST:$INPUT_REMOTE_DOCKER_PORT" fi +if [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_VER" == "v2" ]; then + DOCKER_COMP_COMMAND = "docker compose" +elif [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_VER" == "v1" ]; then + DOCKER_COMP_COMMAND = "docker-compose" +fi + + case $INPUT_DEPLOYMENT_MODE in docker-swarm) @@ -65,7 +72,7 @@ case $INPUT_DEPLOYMENT_MODE in *) INPUT_DEPLOYMENT_MODE="docker-compose" - DEPLOYMENT_COMMAND="docker compose $DEPLOYMENT_COMMAND_OPTIONS -f $STACK_FILE" + DEPLOYMENT_COMMAND="$DOCKER_COMP_COMMAND $DEPLOYMENT_COMMAND_OPTIONS -f $STACK_FILE" ;; esac From f3e04ad4a69f2e96775b27eae91d213bcb5b8921 Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Fri, 15 Oct 2021 10:59:36 -0500 Subject: [PATCH 07/14] Update action.yml --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index c37b6b2..c3f0fa1 100644 --- a/action.yml +++ b/action.yml @@ -22,7 +22,7 @@ inputs: description: Deployment mode either docker-swarm or docker-compose. Default is docker-compose. required: false docker_compose_ver: - description: Sets docker compose version: v1 or v2. Default v2 + description: Sets docker compose version: v1 or v2. required: false default: 'v2' copy_stack_file: From d3f16693a5619ab561a5f266c37d45922beaff3b Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Fri, 15 Oct 2021 11:01:18 -0500 Subject: [PATCH 08/14] Update action.yml --- action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/action.yml b/action.yml index c3f0fa1..a8c226b 100644 --- a/action.yml +++ b/action.yml @@ -24,7 +24,6 @@ inputs: docker_compose_ver: description: Sets docker compose version: v1 or v2. required: false - default: 'v2' copy_stack_file: description: Copy stack file to remote server and deploy from the server. Default is false. required: false From bc34087edf4898a98bf0b63a4bb90ef4ef5005fd Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Fri, 15 Oct 2021 11:03:39 -0500 Subject: [PATCH 09/14] Update action.yml --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index a8c226b..27af49a 100644 --- a/action.yml +++ b/action.yml @@ -22,7 +22,7 @@ inputs: description: Deployment mode either docker-swarm or docker-compose. Default is docker-compose. required: false docker_compose_ver: - description: Sets docker compose version: v1 or v2. + description: Docker-compose version. Default is docker-compose. required: false copy_stack_file: description: Copy stack file to remote server and deploy from the server. Default is false. From 506c43e3576adfa76c68191c8628a9f2b9d51c09 Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Fri, 15 Oct 2021 11:04:04 -0500 Subject: [PATCH 10/14] Update action.yml --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 27af49a..408b01d 100644 --- a/action.yml +++ b/action.yml @@ -22,7 +22,7 @@ inputs: description: Deployment mode either docker-swarm or docker-compose. Default is docker-compose. required: false docker_compose_ver: - description: Docker-compose version. Default is docker-compose. + description: Docker-compose version. Default is v2. required: false copy_stack_file: description: Copy stack file to remote server and deploy from the server. Default is false. From 7cce44e4050734b4a62546a82f917d4af4d6ddff Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Fri, 15 Oct 2021 11:05:00 -0500 Subject: [PATCH 11/14] Update docker-entrypoint.sh --- docker-entrypoint.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ac019b5..5045f29 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -61,6 +61,8 @@ if [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_ DOCKER_COMP_COMMAND = "docker compose" elif [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_VER" == "v1" ]; then DOCKER_COMP_COMMAND = "docker-compose" +else + DOCKER_COMP_COMMAND = "docker compose" fi From ba9e61ea5871fee02f4076442ce0c59fff7dff48 Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Fri, 15 Oct 2021 11:11:42 -0500 Subject: [PATCH 12/14] Update docker-entrypoint.sh --- docker-entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 5045f29..9871437 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -49,6 +49,7 @@ fi STACK_FILE=${INPUT_STACK_FILE_NAME} DEPLOYMENT_COMMAND_OPTIONS="" +DOCKER_COMP_COMMAND="" if [ "$INPUT_COPY_STACK_FILE" == "true" ]; then From 9613c5d901fea5da01ada4b7127312e96da75808 Mon Sep 17 00:00:00 2001 From: gonzalochief <57230398+gonzalochief@users.noreply.github.com> Date: Fri, 15 Oct 2021 11:18:27 -0500 Subject: [PATCH 13/14] Update docker-entrypoint.sh --- docker-entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 9871437..776288f 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -59,11 +59,11 @@ else fi if [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_VER" == "v2" ]; then - DOCKER_COMP_COMMAND = "docker compose" + DOCKER_COMP_COMMAND="docker compose" elif [ "$INPUT_DEPLOYMENT_MODE" == "docker-compose" ] && [ "$INPUT_DOCKER_COMPOSE_VER" == "v1" ]; then - DOCKER_COMP_COMMAND = "docker-compose" + DOCKER_COMP_COMMAND="docker-compose" else - DOCKER_COMP_COMMAND = "docker compose" + DOCKER_COMP_COMMAND="docker compose" fi From d4f5455d990391adb1f4c6c2028ba5373ee02c13 Mon Sep 17 00:00:00 2001 From: Gonzalo Diaz <57230398+gonzalochief@users.noreply.github.com> Date: Sat, 3 Dec 2022 17:39:45 -0500 Subject: [PATCH 14/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ae9abe7..f90a1f9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Below is a brief example on how the action can be used: ```yaml - name: Deploy to Docker swarm - uses: wshihadeh/docker-deployment-action@v1 + uses: gonzalochief/docker-deployment-action@v1 with: remote_docker_host: user@myswarm.com ssh_private_key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }}