From 72fedaf86736fd82858bea08e508f1122227da93 Mon Sep 17 00:00:00 2001 From: Augusto Date: Tue, 23 Jan 2024 10:20:46 +0100 Subject: [PATCH 1/3] Fixing some old-fashioned code in the actions and README.md file --- .github/workflows/release.yml | 1 - README.md | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 08a91806..d1e6a758 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,6 +123,5 @@ jobs: key: ${{ secrets.DEPLOY_KEY }} command: | wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose.yml - wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose-deploy.override.yml docker compose down docker compose --profile prod up -d diff --git a/README.md b/README.md index 62fe7191..626be289 100644 --- a/README.md +++ b/README.md @@ -100,8 +100,8 @@ deploy: user: ${{ secrets.DEPLOY_USER }} key: ${{ secrets.DEPLOY_KEY }} command: | - wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose-deploy.yml -O docker-compose.yml - docker compose down --volumes + wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose.yml -O docker-compose.yml + docker compose down docker compose --profile prod up -d ``` From d6589685369805dcf58a0fbb681046675bd87234 Mon Sep 17 00:00:00 2001 From: Augusto Date: Tue, 23 Jan 2024 15:45:55 +0100 Subject: [PATCH 2/3] Adding the .env to the service deployment --- .github/workflows/release.yml | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d1e6a758..16bbbd07 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,5 +123,6 @@ jobs: key: ${{ secrets.DEPLOY_KEY }} command: | wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose.yml + wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/.env docker compose down docker compose --profile prod up -d diff --git a/README.md b/README.md index 626be289..f169e049 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ deploy: key: ${{ secrets.DEPLOY_KEY }} command: | wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose.yml -O docker-compose.yml + wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/.env docker compose down docker compose --profile prod up -d ``` From f7c58933d386c9299ba5fede1ac0c7fce0bce2fc Mon Sep 17 00:00:00 2001 From: Augusto <49859508+augustocristian@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:11:41 +0100 Subject: [PATCH 3/3] Adding -O to wget to overwrite existing files --- .github/workflows/release.yml | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 16bbbd07..d49ca89b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,7 +122,7 @@ jobs: user: ${{ secrets.DEPLOY_USER }} key: ${{ secrets.DEPLOY_KEY }} command: | - wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose.yml - wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/.env + wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose.yml -O docker-compose.yml + wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/.env -O .env docker compose down docker compose --profile prod up -d diff --git a/README.md b/README.md index f169e049..d3b331ea 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ deploy: key: ${{ secrets.DEPLOY_KEY }} command: | wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose.yml -O docker-compose.yml - wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/.env + wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/.env -O .env docker compose down docker compose --profile prod up -d ```