admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify docker compose (#9602)

Browse Source 
Seems like Spilo doesn't take into account the password?!
This commit is contained in:
Félix Malfait
2025-01-14 12:19:57 +01:00
committed by GitHub
parent 35d165dbe9
commit 459d0b18cf
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/twenty-docker/docker-compose.yml
View File

@ -1,4 +1,3 @@
version: "3.9"
name: twenty name: twenty
services: services:
@ -14,7 +13,7 @@ services:
&& chown -R 1000:1000 /tmp/docker-data" && chown -R 1000:1000 /tmp/docker-data"
server: server:
image: twentycrm/twenty:${TAG} image: twentycrm/twenty:${TAG:-latest}
volumes: volumes:
- server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage} - server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage}
- docker-data:/app/docker-data - docker-data:/app/docker-data
@ -45,7 +44,7 @@ services:
restart: always restart: always
worker: worker:
image: twentycrm/twenty:${TAG} image: twentycrm/twenty:${TAG:-latest}
command: ["yarn", "worker:prod"] command: ["yarn", "worker:prod"]
environment: environment:
PG_DATABASE_URL: postgres://${PGUSER_SUPERUSER:-postgres}:${PGPASSWORD_SUPERUSER:-postgres}@${PG_DATABASE_HOST:-db:5432}/default PG_DATABASE_URL: postgres://${PGUSER_SUPERUSER:-postgres}:${PGPASSWORD_SUPERUSER:-postgres}@${PG_DATABASE_HOST:-db:5432}/default
@ -67,7 +66,7 @@ services:
restart: always restart: always
db: db:
image: twentycrm/twenty-postgres-spilo:${TAG} image: twentycrm/twenty-postgres-spilo:${TAG:-latest}
volumes: volumes:
- db-data:/home/postgres/pgdata - db-data:/home/postgres/pgdata
environment: environment:

8
packages/twenty-docker/scripts/install.sh
View File

@ -90,10 +90,12 @@ else
fi fi
# Generate random strings for secrets # Generate random strings for secrets
echo "# === Randomly generated secrets ===" >>.env echo "# === Randomly generated secret ===" >>.env
echo "APP_SECRET=$(openssl rand -base64 32)" >>.env echo "APP_SECRET=$(openssl rand -base64 32)" >>.env
echo "" >>.env
echo "PGPASSWORD_SUPERUSER=$(openssl rand -hex 16)" >>.env # Issue with Postgres spilo?
#echo "" >>.env
#echo "PGPASSWORD_SUPERUSER=$(openssl rand -hex 16)" >>.env
echo -e "\t• .env configuration completed" echo -e "\t• .env configuration completed"