art-dag/activity-pub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate ${VAR} substitutions from docker-compose.yml
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 1m41s
Details

Browse Source 
Move DATABASE_URL and POSTGRES_PASSWORD to .env via env_file.
docker stack deploy no longer needs env vars sourced, and
repeat deploys won't trigger spurious restarts.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-02-06 22:06:40 +00:00
parent 5e45f24fba
commit 859ff0b835
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitea/workflows/ci.yml
View File

@@ -55,7 +55,6 @@ jobs:
run: | run: |
ssh "root@$DEPLOY_HOST" " ssh "root@$DEPLOY_HOST" "
cd /root/art-dag/activity-pub cd /root/art-dag/activity-pub
set -a && source .env && set +a
docker stack deploy -c docker-compose.yml activitypub docker stack deploy -c docker-compose.yml activitypub
echo 'Waiting for services to update...' echo 'Waiting for services to update...'
sleep 10 sleep 10

6
docker-compose.yml
View File

@@ -3,9 +3,10 @@ version: "3.8"
services: services:
postgres: postgres:
image: postgres:16-alpine image: postgres:16-alpine
env_file:
- .env
environment: environment:
POSTGRES_USER: artdag POSTGRES_USER: artdag
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_DB: artdag POSTGRES_DB: artdag
volumes: volumes:
- postgres_data:/var/lib/postgresql/data - postgres_data:/var/lib/postgresql/data
@@ -45,10 +46,9 @@ services:
- .env - .env
environment: environment:
- ARTDAG_DATA=/data/l2 - ARTDAG_DATA=/data/l2
- DATABASE_URL=postgresql://artdag:${POSTGRES_PASSWORD}@postgres:5432/artdag
- IPFS_API=/dns/ipfs/tcp/5001 - IPFS_API=/dns/ipfs/tcp/5001
- ANCHOR_BACKUP_DIR=/data/anchors - ANCHOR_BACKUP_DIR=/data/anchors
# ARTDAG_DOMAIN, ARTDAG_USER, JWT_SECRET from .env file # DATABASE_URL, ARTDAG_DOMAIN, ARTDAG_USER, JWT_SECRET from .env file
volumes: volumes:
- l2_data:/data/l2 # Still needed for RSA keys - l2_data:/data/l2 # Still needed for RSA keys
- anchor_backup:/data/anchors # Persistent anchor proofs (survives DB wipes) - anchor_backup:/data/anchors # Persistent anchor proofs (survives DB wipes)