Merge pull request #16 from kitconcept/issue-15-resolve-image

Add prune and resolve_image options to this action

Author: ericof

README.md

@@ -33,6 +33,8 @@ GitHub Action and Docker image used to deploy a Docker stack on a Docker Swarm.
 | `remote_user` | `REMOTE_USER` | User with SSH and Docker privileges on the machine running the Docker Swarm manager node. | ✅ | |
 | `remote_private_key` | `REMOTE_PRIVATE_KEY` | Private key used for ssh authentication. | ✅ | |
 | `deploy_timeout` | `DEPLOY_TIMEOUT` | Seconds, to wait until the deploy finishes | | **600** |
+| `resolve_image` | `RESOLVE_IMAGE` | Query the registry to resolve image digest and supported platforms before deploy | | **always** |
+| `prune` | `PRUNE` | Prune services that are not defined in the stack file | | **0** |
 | `stack_file` | `STACK_FILE` | Path to the stack file used in the deploy. | ✅ | |
 | `stack_name` | `STACK_NAME` | Name of the stack to be deployed. | ✅ | |
 | `stack_param` | `STACK_PARAM` | Additional parameter (env var) to be passed to the stack. | | |

action.yml

@@ -35,6 +35,12 @@ inputs:
     description: "Timeout for the deploy check (in seconds)"
     required: false
     default: "600"
+  resolve_image:
+    description: "Query the registry to resolve image digest and supported platforms before deploy (Supported values: always, changed, never)"
+    default: "always"
+  prune:
+    description: "Prune services that are not defined in the stack file (1 to enable, 0 to disable)"
+    default: "0"
   stack_file:
     description: "Path to the stack file to be used for deploy"
     required: true
@@ -68,6 +74,8 @@ runs:
     REMOTE_USER: ${{ inputs.remote_user }}
     REMOTE_PRIVATE_KEY: ${{ inputs.remote_private_key }}
     DEPLOY_TIMEOUT: ${{ inputs.deploy_timeout }}
+    RESOLVE_IMAGE: ${{ inputs.resolve_image }}
+    PRUNE: ${{ inputs.prune }}
     STACK_FILE: ${{ inputs.stack_file }}
     STACK_NAME: ${{ inputs.stack_name }}
     STACK_PARAM: ${{ inputs.stack_param }}

scripts/docker-entrypoint.sh

@@ -7,6 +7,10 @@ SSH_KEY="${SSH_DIR}/docker"
 KNOWN_HOSTS="${SSH_DIR}/known_hosts"
 ENV_FILE_PATH="/root/.env"
 
+OPTS=("--with-registry-auth" "--resolve-image=${RESOLVE_IMAGE:-always}")
+[ "${PRUNE:-0}" = "1" ] && OPTS+=("--prune")
+
+
 login() {
   echo "${PASSWORD}" | docker login "${REGISTRY}" -u "${USERNAME}" --password-stdin
 }
@@ -61,7 +65,7 @@ connect_ssh() {
 }
 
 deploy() {
-  docker stack deploy --with-registry-auth -c "${STACK_FILE}" "${STACK_NAME}"
+  docker stack deploy "${OPTS[@]}" -c "${STACK_FILE}" "${STACK_NAME}"
 }
 
 check_deploy() {