From ea06f04350f623afdf310d87fba04e370329b507 Mon Sep 17 00:00:00 2001
From: martmull <martmull@hotmail.fr>
Date: Wed, 3 Jan 2024 14:25:24 +0100
Subject: [PATCH] 3207 fix render self deploy (#3221)

* Fix paths and commands for render deploy

* Remove breaking change

* Use twentycrm postgres image for postgres

* Fix render script

* Specify docker image version

* Fix postgres user

* Update setup command
---
 packages/twenty-server/package.json          |  1 +
 packages/twenty-server/scripts/render-run.sh |  4 ++--
 render.yaml                                  | 17 +++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.json
index 33bf7ca2a..498e71ea5 100644
--- a/packages/twenty-server/package.json
+++ b/packages/twenty-server/package.json
@@ -23,6 +23,7 @@
     "typeorm:migrate": "yarn typeorm migration:run -d ./src/database/typeorm/metadata/metadata.datasource.ts && yarn typeorm migration:run -d ./src/database/typeorm/core/core.datasource.ts",
     "database:init": "yarn database:setup && yarn database:seed:dev",
     "database:setup": "npx ts-node ./scripts/setup-db.ts && yarn database:migrate",
+    "database:setup:prod": "npx ts-node ./scripts/setup-db.ts && yarn typeorm:migrate",
     "database:truncate": "npx ts-node ./scripts/truncate-db.ts",
     "database:migrate": "yarn build && yarn typeorm:migrate",
     "database:seed:dev": "yarn build && yarn command workspace:seed:dev",
diff --git a/packages/twenty-server/scripts/render-run.sh b/packages/twenty-server/scripts/render-run.sh
index 97add4561..515eb812e 100755
--- a/packages/twenty-server/scripts/render-run.sh
+++ b/packages/twenty-server/scripts/render-run.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 export PG_DATABASE_URL=postgres://twenty:twenty@$PG_DATABASE_HOST:$PG_DATABASE_PORT/default
-yarn database:setup
-node dist/src/main
\ No newline at end of file
+yarn database:setup:prod
+node dist/src/main
diff --git a/render.yaml b/render.yaml
index 7f2f48b4f..db9a56d8b 100644
--- a/render.yaml
+++ b/render.yaml
@@ -1,8 +1,8 @@
 services:
 - type: web
   name: front
-  env: docker
-  dockerfilePath: ./infra/prod/front/Dockerfile
+  runtime: docker
+  dockerfilePath: ./packages/twenty-docker/prod/twenty-front/Dockerfile
   autoDeploy: false
   envVars:
     - key: REACT_APP_SERVER_BASE_URL
@@ -12,8 +12,8 @@ services:
         envVarKey: RENDER_EXTERNAL_URL
 - type: web
   name: server
-  env: docker
-  dockerfilePath: ./infra/prod/server/Dockerfile
+  runtime: docker
+  dockerfilePath: ./packages/twenty-docker/prod/twenty-server/Dockerfile
   dockerCommand: "sh -c ./scripts/render-run.sh"
   autoDeploy: false
   envVars:
@@ -44,8 +44,9 @@ services:
     sizeGB: 5
 - type: pserv
   name: twenty_postgres
-  env: docker
-  dockerfilePath: ./infra/prod/postgres/Dockerfile
+  runtime: image
+  image:
+    url: twentycrm/twenty-postgres:latest
   autoDeploy: false
   disk:
     name: data
@@ -53,8 +54,8 @@ services:
     sizeGB: 10
   envVars:
   - key: POSTGRES_USER
-    value: twenty
+    value: postgres
   - key: POSTGRES_PASSWORD
-    value: twenty
+    value: postgres
   - key: POSTGRES_DB
     value: default