From 0cb5842c531158b92d07a116c346c8cc0bcca2b2 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Mon, 21 Dec 2020 21:10:08 +0100 Subject: [PATCH 01/10] Updated CHANGELOG. Changed Dockerfile. --- CHANGELOG.md | 5 +++++ Dockerfile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b80cf54..b0af20f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # [Unreleased] +## [v1.0.2] - 2020-12-21 + +### Fixed +- Dockerfile used to copy just entrypoint.sh. + ## [v1.0.1] - 2020-12-21 ### Fixed diff --git a/Dockerfile b/Dockerfile index 1e1aeef..ad1c400 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,6 @@ RUN apk update && \ COPY LICENSE README.md / -COPY *.sh ./ +COPY *.sh / ENTRYPOINT ["/entrypoint.sh"] From 5b2be75e1ab49f4d313e7dad39e85357e2a96bab Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Mon, 21 Dec 2020 21:39:35 +0100 Subject: [PATCH 02/10] Changed Dockerfile. --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ad1c400..52efa12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,9 @@ RUN apk update && \ COPY LICENSE README.md / -COPY *.sh / + +COPY entrypoint.sh /entrypoint.sh +COPY with_key.sh /with_key.sh +COPY with_pass.sh /with_pass.sh ENTRYPOINT ["/entrypoint.sh"] From e3f5136f756e44b34dc7721ecff129e2d62f3c42 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Mon, 21 Dec 2020 21:44:32 +0100 Subject: [PATCH 03/10] Changed Dockerfile. --- .github/workflows/main.yml | 2 +- Dockerfile | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9bc551e..30a2c1e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: underscore69/ssh-scp-deploy@main + - uses: underscore69/ssh-scp-deploy@development with: local: "./" remote: "~/" diff --git a/Dockerfile b/Dockerfile index 52efa12..bdc6f99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,6 @@ RUN apk update && \ bash COPY LICENSE README.md / - - -COPY entrypoint.sh /entrypoint.sh -COPY with_key.sh /with_key.sh -COPY with_pass.sh /with_pass.sh +COPY entrypoint.sh with_key.sh with_pass.sh / ENTRYPOINT ["/entrypoint.sh"] From 0cdc30a56fa15c08a61f5aaaecf5ca101f2035f0 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Mon, 21 Dec 2020 21:53:04 +0100 Subject: [PATCH 04/10] Changed Dockerfile. --- entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index f4e9b79..af8c66b 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,7 @@ #!/bin/bash -PASSWORD=${INPUT_PASSWORD} -KEY=${INPUT_KEY} +PASSWORD=${INPUT_PASSWORD}; +KEY=${INPUT_KEY}; + if [ -z "$PRE_UPLOAD" and "$PASSWORD"]; then echo "🔑 Please provide at least a key or a password..."; exit 0; From 3393f067828e57627274bf9982ea692427acd422 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Mon, 21 Dec 2020 22:00:05 +0100 Subject: [PATCH 05/10] Changed main and entrypoint. --- .github/workflows/main.yml | 2 +- entrypoint.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30a2c1e..20bbc03 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: underscore69/ssh-scp-deploy@development + - uses: marcodallasanta/ssh-scp-deploy@development with: local: "./" remote: "~/" diff --git a/entrypoint.sh b/entrypoint.sh index af8c66b..256dd55 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,5 @@ #!/bin/bash + PASSWORD=${INPUT_PASSWORD}; KEY=${INPUT_KEY}; From b4eb8f8a33d8aaa5a8b65a08caa7e5653e0f135f Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Mon, 21 Dec 2020 22:05:47 +0100 Subject: [PATCH 06/10] Changed entrypoiny.sh . --- .github/workflows/main.yml | 2 +- entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20bbc03..470d0da 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: marcodallasanta/ssh-scp-deploy@development + - uses: marcodallasanta/ssh-scp-deploy@main with: local: "./" remote: "~/" diff --git a/entrypoint.sh b/entrypoint.sh index 256dd55..ccec018 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,7 +3,7 @@ PASSWORD=${INPUT_PASSWORD}; KEY=${INPUT_KEY}; -if [ -z "$PRE_UPLOAD" and "$PASSWORD"]; then +if [ -z "$PRE_UPLOAD" ] && [ "$PASSWORD" ]; then echo "🔑 Please provide at least a key or a password..."; exit 0; fi From d744479d593bfdeb90833d983a8b5b8a40f13153 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Mon, 21 Dec 2020 22:06:57 +0100 Subject: [PATCH 07/10] Changed entrypoiny.sh . --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index ccec018..e2afc06 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -8,7 +8,7 @@ if [ -z "$PRE_UPLOAD" ] && [ "$PASSWORD" ]; then exit 0; fi -if [[ ! -z "$KEY" ]]; then +if [[ -n "$KEY" ]]; then echo "🔑 Using key file..."; . with_key.sh; else From 7d6ed29410a7eac019f0a3c026e8e34e446b2b43 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Mon, 21 Dec 2020 22:09:43 +0100 Subject: [PATCH 08/10] Changed CHANGELOG.md . --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 470d0da..6c903d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: - uses: marcodallasanta/ssh-scp-deploy@main with: - local: "./" + local: "CHANGELOG.md" remote: "~/" host: ${{secrets.HOST}} user: ${{secrets.USER}} From 5473b2d02c5f49a3a479ca9f60d1a85e74401d3e Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Mon, 21 Dec 2020 22:27:03 +0100 Subject: [PATCH 09/10] Changed CHANGELOG.md . --- entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index e2afc06..c58ab2b 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -10,8 +10,8 @@ fi if [[ -n "$KEY" ]]; then echo "🔑 Using key file..."; - . with_key.sh; + . /with_key.sh; else echo "🔑 Using password..."; - . with_pass.sh; + . /with_pass.sh; fi \ No newline at end of file From 5a27574133cdcd4264560aebc7fd4f83a45e8daf Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Mon, 21 Dec 2020 22:48:14 +0100 Subject: [PATCH 10/10] Changed entry . --- entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index c58ab2b..cd55f05 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -10,8 +10,8 @@ fi 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 \ No newline at end of file