Merge pull request #10 from marcodallasanta/development

Fixed hardcoded user in scp.

.github/workflows/main.yml

@@ -12,9 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - uses: underscore69/ssh-scp-deploy@main
+      - uses: marcodallasanta/ssh-scp-deploy@main
         with:
-          local: "./"
+          local: "CHANGELOG.md"
           remote: "~/"
           host: ${{secrets.HOST}}
           user: ${{secrets.USER}}

CHANGELOG.md

@@ -1,6 +1,16 @@
 # [Unreleased]
 
 
+## [v1.0.3] - 2021-02-08
+
+### Fixed
+- Hardcoded user "ubuntu" in scp.
+
+## [v1.0.2] - 2020-12-21
+
+### Fixed
+- Dockerfile used to copy just entrypoint.sh.
+
 ## [v1.0.1] - 2020-12-21
 
 ### Fixed
@@ -13,5 +23,7 @@
 
 
 [unreleased]: https://github.com/marcodallasanta/ssh-scp-deploy/compare/main...development
+[v1.0.3]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.3
+[v1.0.2]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.2
 [v1.0.1]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.1
 [v1.0.0]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.0

Dockerfile

@@ -7,7 +7,6 @@ RUN  apk update && \
   bash
 
 COPY LICENSE README.md /
-
-COPY *.sh ./
+COPY entrypoint.sh with_key.sh with_pass.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]

entrypoint.sh

@@ -1,15 +1,17 @@
 #!/bin/bash
-PASSWORD=${INPUT_PASSWORD}
-KEY=${INPUT_KEY}
-if [ -z "$PRE_UPLOAD" and "$PASSWORD"]; then
+
+PASSWORD=${INPUT_PASSWORD};
+KEY=${INPUT_KEY};
+
+if [ -z "$PRE_UPLOAD" ] && [ "$PASSWORD" ]; then
     echo "🔑 Please provide at least a key or a password...";
     exit 0;
 fi
 
-if [[ ! -z "$KEY" ]]; then
+if [[ -n "$KEY" ]]; then
     echo "🔑 Using key file...";
-    . with_key.sh;
+    source /with_key.sh;
 else
     echo "🔑 Using password...";
-    . with_pass.sh;
+    source /with_pass.sh;
 fi

with_key.sh

@@ -11,7 +11,7 @@ if [ ! -z "$PRE_UPLOAD" ]; then
 fi
 
 echo "🚚 Uploading via scp..." &&
-scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ubuntu@${INPUT_HOST}:"${INPUT_REMOTE}" &&
+scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" &&
 echo "🙌 Uploaded via scp";
 
 POST_UPLOAD=${INPUT_POST_UPLOAD}

with_pass.sh

@@ -6,7 +6,7 @@ if [ ! -z "$PRE_UPLOAD" ]; then
 fi
 
 echo "🚚 Uploading via scp..." &&
-sshpass -p ${PASSWORD} scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ubuntu@${INPUT_HOST}:"${INPUT_REMOTE}" &&
+sshpass -p ${PASSWORD} scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" &&
 echo "🙌 Uploaded via scp";
 
 POST_UPLOAD=${INPUT_POST_UPLOAD}