From 459d0b18cf7261098afd643dd714f6790139c3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Malfait?= <felix.malfait@gmail.com>
Date: Tue, 14 Jan 2025 12:19:57 +0100
Subject: [PATCH] Simplify docker compose (#9602)

Seems like Spilo doesn't take into account the password?!
---
 packages/twenty-docker/docker-compose.yml | 7 +++----
 packages/twenty-docker/scripts/install.sh | 8 +++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/twenty-docker/docker-compose.yml b/packages/twenty-docker/docker-compose.yml
index 09e81bfa4..df3293cbf 100644
--- a/packages/twenty-docker/docker-compose.yml
+++ b/packages/twenty-docker/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3.9"
 name: twenty
 
 services:
@@ -14,7 +13,7 @@ services:
       && chown -R 1000:1000 /tmp/docker-data"
 
   server:
-    image: twentycrm/twenty:${TAG}
+    image: twentycrm/twenty:${TAG:-latest}
     volumes:
       - server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage}
       - docker-data:/app/docker-data
@@ -45,7 +44,7 @@ services:
     restart: always
 
   worker:
-    image: twentycrm/twenty:${TAG}
+    image: twentycrm/twenty:${TAG:-latest}
     command: ["yarn", "worker:prod"]
     environment:
       PG_DATABASE_URL: postgres://${PGUSER_SUPERUSER:-postgres}:${PGPASSWORD_SUPERUSER:-postgres}@${PG_DATABASE_HOST:-db:5432}/default
@@ -67,7 +66,7 @@ services:
     restart: always
 
   db:
-    image: twentycrm/twenty-postgres-spilo:${TAG}
+    image: twentycrm/twenty-postgres-spilo:${TAG:-latest}
     volumes:
       - db-data:/home/postgres/pgdata
     environment:
diff --git a/packages/twenty-docker/scripts/install.sh b/packages/twenty-docker/scripts/install.sh
index bb647315e..5d560d6c7 100755
--- a/packages/twenty-docker/scripts/install.sh
+++ b/packages/twenty-docker/scripts/install.sh
@@ -90,10 +90,12 @@ else
 fi
 
 # Generate random strings for secrets
-echo "# === Randomly generated secrets ===" >>.env
+echo "# === Randomly generated secret ===" >>.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"