Merge pull request #2 from aosus/upload-directory

Add option to upload Docker directory

Author: FarisZR

README.md

@@ -55,9 +55,15 @@ SSH key must be in PEM format (begins with -----BEGIN RSA PRIVATE KEY-----)
 
 The SSH port to be used. Default is 22.
 
-### `stack_file_name`
+### `compose_file_path`
 
-Docker stack file used. Default is docker-compose.yml
+path for Docker compose file used. Default is `docker-compose.yml`(repo root), for example when it's inside a sub-directory `caddy/docker-compose.yml`
+
+### `upload_directory`
+Uploads docker compose directory, useful when extra files like Configs are needed for the compose project.
+
+### `docker_compose_directory`
+Specifies which directory in the repository to upload, needed for upload_directory
 
 ### `docker_login_user`
 

action.yml

@@ -15,12 +15,18 @@ inputs:
   args:
     description: Deployment command args.
     required: true
-  compose_file_name:
-    description: Docker compose file used. Default is docker-compose.yaml
+  compose_file_path:
+    description: path for Docker compose file used. Default is is repo root(docker-compose.yml)
     required: false
   ssh_port:
     description: The ssh port of the server. Default is 22
     required: false
+  upload_directory:
+    description: when enabled, uploads entire docker directory, useful for configuration files needed along the container
+    default: 'false'
+  docker_compose_directory:
+    description: specifies which directory to upload, needed for upload_directory
+    required: false
   docker_login_password:
     description: The docker login password
     required: false

docker-entrypoint.sh

@@ -35,15 +35,15 @@ if [ -z "$INPUT_ARGS" ]; then
   exit 1
 fi
 
-if [ -z "$INPUT_COMPOSE_FILE_NAME" ]; then
-  INPUT_COMPOSE_FILE_NAME=docker-compose.yml
+if [ -z "$INPUT_COMPOSE_FILE_PATH" ]; then
+  INPUT_COMPOSE_FILE_PATH=docker-compose.yml
 fi
 
 if [ -z "$INPUT_SSH_PORT" ]; then
   INPUT_SSH_PORT=22
 fi
 
-COMPOSE_FILE=${INPUT_COMPOSE_FILE_NAME}
+COMPOSE_FILE=${INPUT_COMPOSE_FILE_PATH}
 DOCKER_HOST=ssh://${INPUT_REMOTE_DOCKER_HOST}:${INPUT_SSH_PORT}
 DEPLOYMENT_COMMAND="docker compose -f $COMPOSE_FILE"
 
@@ -77,6 +77,17 @@ echo "Create docker context"
 docker context create staging --docker "host=ssh://$INPUT_REMOTE_DOCKER_HOST:$INPUT_SSH_PORT"
 docker context use staging
 
+if $INPUT_UPLOAD_DIRECTORY
+then
+    echo "upload_directory enabled"
+    if [ -z "$INPUT_DOCKER_COMPOSE_DIRECTORY" ]; 
+    then
+      echo "Input docker_compose_directory is required when upload_directory is enabled!"
+      exit 1
+    fi
+    tar cjvf - -C "$GITHUB_WORKSPACE" "$INPUT_DOCKER_COMPOSE_DIRECTORY" | ssh -o StrictHostKeyChecking=no "$INPUT_REMOTE_DOCKER_HOST" 'tar -xjvf -'
+    echo "Upload finished"
+fi
 
 if  [ -n "$INPUT_DOCKER_LOGIN_PASSWORD" ] || [ -n "$INPUT_DOCKER_LOGIN_USER" ] || [ -n "$INPUT_DOCKER_LOGIN_REGISTRY" ]; then
   echo "Connecting to $INPUT_REMOTE_DOCKER_HOST... Command: docker login"