Skip to content

Commit

Permalink
chore: configurable FILE_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
enisdenjo committed Nov 24, 2023
1 parent 3bed6ea commit 4d9b59e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/reusable-deploy-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ on:
required: true
PGBACKREST_CONF_PATH:
required: true
FILE_DIR:
required: true

jobs:
deploy:
Expand Down Expand Up @@ -65,4 +67,5 @@ jobs:
SESSION_SECRET: ${{ secrets.SESSION_SECRET }}
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
PGBACKREST_CONF_PATH: ${{ secrets.PGBACKREST_CONF_PATH }}
FILE_DIR: ${{ secrets.FILE_DIR }}
run: docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d --wait --wait-timeout 180
3 changes: 0 additions & 3 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ services:
server:
environment:
- SERVER_PORT=${SERVER_PORT}
- FILE_DIR=/var/heltin-data
volumes:
- ${FILE_DIR}:/var/heltin-data # ${FILE_DIR} taken from .env
ports:
- ${SERVER_PORT}:${SERVER_PORT}
gotenberg:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ services:
- SERVER_TLS_PORT=443
- CERT_DIR=/srv/certs
- APP_DOMAINS=${APP_DOMAINS}
- FILE_DIR=/var/heltin-data
volumes:
- server-certs:/srv/certs
- heltin-data:/var/heltin-data # cannot use ${FILE_DIR} because it takes it from .env
ports:
- 80:80
- 443:443
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ services:
- GOTENBERG_HOST=gotenberg
- GOTENBERG_PORT=${GOTENBERG_PORT}
- GRAPHQL_ENDPOINT=http://graphql:${GRAPHQL_PORT}/graphql
- FILE_DIR=/var/heltin-data
volumes:
- ${FILE_DIR}:/var/heltin-data
healthcheck:
test: curl -f http://localhost:$$SERVER_PORT/index.html?healthcheck || exit 1
interval: 7s
Expand Down

0 comments on commit 4d9b59e

Please sign in to comment.