From de9ff8a4c8eeee62f486a96b34cab798ec5d64ba Mon Sep 17 00:00:00 2001 From: malteish Date: Wed, 26 Jun 2024 12:40:48 +0200 Subject: [PATCH 1/4] create variable defining where to store state --- .github/workflows/deploy.yml | 2 +- .github/workflows/resetStagingState.yml | 2 +- docker/docker-compose.yml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2b50a6f2d..0a5103fde 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -146,7 +146,7 @@ jobs: run: | if [ $environment_name == "testing" ]; then ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\ - cd /mnt/dm3_prod_volume/db && rm -r * || true" + cd ${{ vars.PERSISTENCE_DIRECTORY }}/db && rm -r * || true" fi - name: Configure Firewall run: | diff --git a/.github/workflows/resetStagingState.yml b/.github/workflows/resetStagingState.yml index f7e86f1ea..f7c3a71c7 100644 --- a/.github/workflows/resetStagingState.yml +++ b/.github/workflows/resetStagingState.yml @@ -15,7 +15,7 @@ jobs: - name: Reset state of staging environment run: | ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\ - cd /mnt/dm3_prod_volume/db && rm -r * || true" + cd ${{ vars.PERSISTENCE_DIRECTORY }}/db && rm -r * || true" - name: Start docker on server run: | ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ccb52f6cc..aaf85e639 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -40,7 +40,7 @@ services: image: redis restart: always volumes: - - /mnt/dm3_prod_volume/db/redis:/data + - ${PERSISTENCE_DIRECTORY}/db/redis:/data dm3-storage: image: postgres:13 @@ -51,7 +51,7 @@ services: POSTGRES_PASSWORD: prisma POSTGRES_DB: dm3 volumes: - - /mnt/dm3_prod_volume/storage/postgres:/var/lib/postgresql/data + - ${PERSISTENCE_DIRECTORY}/storage/postgres:/var/lib/postgresql/data delivery-service: image: dm3-delivery-service @@ -75,7 +75,7 @@ services: restart: always container_name: redis-delivery-service volumes: - - /mnt/dm3_prod_volume/db/redis-delivery-service:/data + - ${PERSISTENCE_DIRECTORY}/db/redis-delivery-service:/data offchain-resolver-db: image: postgres @@ -84,7 +84,7 @@ services: environment: POSTGRES_PASSWORD: example volumes: - - /mnt/dm3_prod_volume/db/postgres:/var/lib/postgresql/data + - ${PERSISTENCE_DIRECTORY}/db/postgres:/var/lib/postgresql/data offchain-resolver: image: dm3-offchain-resolver @@ -149,5 +149,5 @@ volumes: driver: local driver_opts: type: none - device: /mnt/dm3_prod_volume/webroot + device: ${PERSISTENCE_DIRECTORY}/webroot o: bind From d295309226fa979af7bc821f2cb522a01d6f3461 Mon Sep 17 00:00:00 2001 From: malteish Date: Tue, 16 Jul 2024 10:37:40 +0200 Subject: [PATCH 2/4] reset storage --- .github/workflows/deploy.yml | 3 ++- .github/workflows/resetStagingState.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a999ab9df..d7504a8fe 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -149,7 +149,8 @@ jobs: run: | if [ $environment_name == "testing" ]; then ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\ - cd ${{ vars.PERSISTENCE_DIRECTORY }}/db && rm -r * || true" + cd ${{ vars.PERSISTENCE_DIRECTORY }}/db && rm -r * || true + && cd ${{ vars.PERSISTENCE_DIRECTORY }}/storage && rm -r * || true" fi - name: Configure Firewall run: | diff --git a/.github/workflows/resetStagingState.yml b/.github/workflows/resetStagingState.yml index f7c3a71c7..fea0898ee 100644 --- a/.github/workflows/resetStagingState.yml +++ b/.github/workflows/resetStagingState.yml @@ -15,7 +15,8 @@ jobs: - name: Reset state of staging environment run: | ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\ - cd ${{ vars.PERSISTENCE_DIRECTORY }}/db && rm -r * || true" + cd ${{ vars.PERSISTENCE_DIRECTORY }}/db && rm -r * || true \ + && cd ${{ vars.PERSISTENCE_DIRECTORY }}/storage && rm -r * || true" - name: Start docker on server run: | ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\ From 3e26085e08eed672c433e9acee967afcf2f03c82 Mon Sep 17 00:00:00 2001 From: malteish Date: Tue, 16 Jul 2024 10:39:03 +0200 Subject: [PATCH 3/4] fix pipe --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/resetStagingState.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d7504a8fe..bc1882858 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -149,8 +149,8 @@ jobs: run: | if [ $environment_name == "testing" ]; then ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\ - cd ${{ vars.PERSISTENCE_DIRECTORY }}/db && rm -r * || true - && cd ${{ vars.PERSISTENCE_DIRECTORY }}/storage && rm -r * || true" + cd ${{ vars.PERSISTENCE_DIRECTORY }}/db && rm -r * || true; + cd ${{ vars.PERSISTENCE_DIRECTORY }}/storage && rm -r * || true" fi - name: Configure Firewall run: | diff --git a/.github/workflows/resetStagingState.yml b/.github/workflows/resetStagingState.yml index fea0898ee..00f689f08 100644 --- a/.github/workflows/resetStagingState.yml +++ b/.github/workflows/resetStagingState.yml @@ -15,8 +15,8 @@ jobs: - name: Reset state of staging environment run: | ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\ - cd ${{ vars.PERSISTENCE_DIRECTORY }}/db && rm -r * || true \ - && cd ${{ vars.PERSISTENCE_DIRECTORY }}/storage && rm -r * || true" + cd ${{ vars.PERSISTENCE_DIRECTORY }}/db && rm -r * || true; \ + cd ${{ vars.PERSISTENCE_DIRECTORY }}/storage && rm -r * || true" - name: Start docker on server run: | ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\ From 0bdc83da11620e600357ea177739a3d76baea259 Mon Sep 17 00:00:00 2001 From: malteish Date: Tue, 16 Jul 2024 10:48:16 +0200 Subject: [PATCH 4/4] add PERSISTENCE_DIRECTORY to env --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index bc1882858..fe32cb0a7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -71,6 +71,7 @@ jobs: echo "DATABASE_URL=${{ secrets.DATABASE_URL }}" >> ./.env echo "RESOLVER_SUPPORTED_ADDR_ENS_SUBDOMAINS=${{ vars.RESOLVER_SUPPORTED_ADDR_ENS_SUBDOMAINS }}" >> ./.env echo "RESOLVER_SUPPORTED_NAME_ENS_SUBDOMAINS=${{ vars.RESOLVER_SUPPORTED_NAME_ENS_SUBDOMAINS }}" >> ./.env + echo "PERSISTENCE_DIRECTORY=${{ vars.PERSISTENCE_DIRECTORY }}" >> ./.env envsubst '${TARGET_HOST} ${TARGET_IP}' < ./docker/nginx.conf > ./nginx.conf cat ./.env - name: Prepare docker build environment