From e75da89239fa4b9ec318ecae33d88503e55c6335 Mon Sep 17 00:00:00 2001
From: Andrei Canta <deiucanta@gmail.com>
Date: Fri, 27 Sep 2024 14:30:46 +0300
Subject: [PATCH] update twenty

---
 twenty/code/.env.example         | 12 +++++-------
 twenty/code/docker-compose.yml   |  2 ++
 twenty/code/twenty/Dockerfile    |  2 ++
 twenty/code/twenty/entrypoint.sh |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/twenty/code/.env.example b/twenty/code/.env.example
index 342e37e..c254822 100644
--- a/twenty/code/.env.example
+++ b/twenty/code/.env.example
@@ -1,18 +1,16 @@
 TAG=latest
 
-POSTGRES_ADMIN_PASSWORD=replace_me_with_a_strong_password
+# POSTGRES_ADMIN_PASSWORD=replace_me_with_a_strong_password
 
 PG_DATABASE_HOST=db:5432
 
 SERVER_URL=http://localhost:3000
-# Uncoment if you are serving your front on another server than the API (eg. bucket)
-# FRONT_BASE_URL=http://localhost:3000
 
 # Use openssl rand -base64 32 for each secret
-ACCESS_TOKEN_SECRET=replace_me_with_a_random_string_access
-LOGIN_TOKEN_SECRET=replace_me_with_a_random_string_login
-REFRESH_TOKEN_SECRET=replace_me_with_a_random_string_refresh
-FILE_TOKEN_SECRET=replace_me_with_a_random_string_refresh
+# ACCESS_TOKEN_SECRET=replace_me_with_a_random_string_access
+# LOGIN_TOKEN_SECRET=replace_me_with_a_random_string_login
+# REFRESH_TOKEN_SECRET=replace_me_with_a_random_string_refresh
+# FILE_TOKEN_SECRET=replace_me_with_a_random_string_refresh
 
 SIGN_IN_PREFILLED=true
 
diff --git a/twenty/code/docker-compose.yml b/twenty/code/docker-compose.yml
index 89f1e06..0e89be7 100644
--- a/twenty/code/docker-compose.yml
+++ b/twenty/code/docker-compose.yml
@@ -18,6 +18,8 @@ services:
     volumes:
       - server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage}
       - docker-data:/app/docker-data
+    # ports:
+    #   - "3000:3000"
     environment:
       PORT: 3000
       PG_DATABASE_URL: postgres://twenty:twenty@${PG_DATABASE_HOST}/default
diff --git a/twenty/code/twenty/Dockerfile b/twenty/code/twenty/Dockerfile
index ee0b052..e57cf30 100644
--- a/twenty/code/twenty/Dockerfile
+++ b/twenty/code/twenty/Dockerfile
@@ -50,6 +50,8 @@ FROM node:18.17.1-alpine as twenty
 # Used to run healthcheck in docker
 RUN apk add --no-cache curl jq
 
+RUN npm install -g tsx
+
 COPY ./packages/twenty-docker/twenty/entrypoint.sh /app/entrypoint.sh
 RUN chmod +x /app/entrypoint.sh
 
diff --git a/twenty/code/twenty/entrypoint.sh b/twenty/code/twenty/entrypoint.sh
index 17adc89..9733781 100755
--- a/twenty/code/twenty/entrypoint.sh
+++ b/twenty/code/twenty/entrypoint.sh
@@ -5,7 +5,7 @@ if [ "${ENABLE_DB_MIGRATIONS}" = "true" ] && [ ! -f /app/docker-data/db_status ]
     echo "Running database setup and migrations..."
 
     # Run setup and migration scripts
-    NODE_OPTIONS="--max-old-space-size=1500" npx ts-node ./scripts/setup-db.ts
+    NODE_OPTIONS="--max-old-space-size=1500" tsx ./scripts/setup-db.ts
     yarn database:migrate:prod
 
     # Mark initialization as done