Skip to content

Commit

Permalink
Merge pull request #1059 from dm3-org/addVariableForPersistenceDirectory
Browse files Browse the repository at this point in the history
Add variable for persistence directory
  • Loading branch information
malteish authored Jul 16, 2024
2 parents a215989 + 0bdc83d commit 2b8503c
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 5 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -145,6 +146,13 @@ jobs:
ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\
cd dm3 && ls |grep -E 'dm3-.*tar' | xargs --no-run-if-empty -L 1 docker load -i; \
rm dm3-*.tar || true"
- name: Reset state of testing environment
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"
fi
- name: Configure Firewall
run: |
ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/resetStagingState.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: deploy
on: workflow_dispatch

jobs:
reset-staging-state:
environment: 'staging'
runs-on: ubuntu-latest
steps:
- name: Stop docker on server
run: |
ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\
cd dm3 && docker compose down"
ssh -i ./ssh-key root@${{ vars.HOST_DOMAIN }} "\
systemctl restart docker.service"
- 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"
- name: Start docker on server
run: |
ssh -i ./ssh-key app@${{ vars.HOST_DOMAIN }} "\
cd dm3 && docker compose --env-file .env up -d && docker system prune -af"
10 changes: 5 additions & 5 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -148,5 +148,5 @@ volumes:
driver: local
driver_opts:
type: none
device: /mnt/dm3_prod_volume/webroot
device: ${PERSISTENCE_DIRECTORY}/webroot
o: bind

0 comments on commit 2b8503c

Please sign in to comment.