From cd821a934d2bb4d0a79a0736608d3d9fb70c511d Mon Sep 17 00:00:00 2001
From: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com>
Date: Fri, 26 May 2023 14:04:15 +0530
Subject: [PATCH] chore: update single click deployments (#1141)

* chore: update single click deployments

* dev: update environment variables
---
 .env.example             |  6 ++++++
 app.json                 | 26 +++++++++++++-------------
 deploy/heroku/Dockerfile |  4 ++++
 docker-compose-hub.yml   |  6 +++---
 docker-compose.yml       | 10 +++-------
 heroku.yml               |  3 +++
 6 files changed, 32 insertions(+), 23 deletions(-)
 create mode 100644 deploy/heroku/Dockerfile
 create mode 100644 heroku.yml

diff --git a/.env.example b/.env.example
index 8e65a6900..7a7318455 100644
--- a/.env.example
+++ b/.env.example
@@ -45,4 +45,10 @@ GITHUB_CLIENT_SECRET="" # For fetching release notes
 # Settings related to Docker
 DOCKERIZED=1
 
+# Database Settings
+PGUSER="plane"
+PGPASSWORD="plane"
+PGHOST="plane-db"
+PGDATABASE="plane"
+
 # Auto generated and Required that will be generated from setup.sh
\ No newline at end of file
diff --git a/app.json b/app.json
index 7f6b27427..bc5789078 100644
--- a/app.json
+++ b/app.json
@@ -37,6 +37,14 @@
       "description": "Email host to send emails from",
       "value": ""
     },
+    "EMAIL_FROM": {
+      "description": "Email Sender",
+      "value": ""
+    },
+    "EMAIL_PORT": {
+      "description": "The default Email PORT to use",
+      "value": "587"
+    },
     "AWS_REGION": {
       "description": "AWS Region to use for S3",
       "value": "false"
@@ -49,30 +57,22 @@
       "description": "AWS Secret Access Key to use for S3",
       "value": ""
     },
-    "SENTRY_DSN": {
-      "description": "",
-      "value": ""
-    },
     "AWS_S3_BUCKET_NAME": {
       "description": "AWS Bucket Name to use for S3",
       "value": ""
     },
+    "SENTRY_DSN": {
+      "description": "",
+      "value": ""
+    },
     "WEB_URL": {
-      "description": "Web URL for Plane",
+      "description": "Web URL for Plane this will be used for redirections in the emails",
       "value": ""
     },
     "GITHUB_CLIENT_SECRET": {
       "description": "Github Client Secret",
       "value": ""
     },
-    "NEXT_PUBLIC_GITHUB_ID": {
-      "description": "Next Public Github ID",
-      "value": ""
-    },
-    "NEXT_PUBLIC_GOOGLE_CLIENTID": {
-      "description": "Next Public Google Client ID",
-      "value": ""
-    },
     "NEXT_PUBLIC_API_BASE_URL": {
       "description": "Next Public API Base URL",
       "value": ""
diff --git a/deploy/heroku/Dockerfile b/deploy/heroku/Dockerfile
new file mode 100644
index 000000000..edae32788
--- /dev/null
+++ b/deploy/heroku/Dockerfile
@@ -0,0 +1,4 @@
+# Deploy the Plane image
+FROM makeplane/plane
+
+LABEL maintainer="engineering@plane.so"
\ No newline at end of file
diff --git a/docker-compose-hub.yml b/docker-compose-hub.yml
index 465f9d3f3..b3d8f1cd3 100644
--- a/docker-compose-hub.yml
+++ b/docker-compose-hub.yml
@@ -24,7 +24,7 @@ services:
                 command: ./bin/takeoff
                 environment:
                         DJANGO_SETTINGS_MODULE: plane.settings.production
-                        DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@plane-db:5432/plane
+                        DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@${PGHOST}:5432/${PGDATABASE}
                         REDIS_URL: redis://plane-redis:6379/
                         EMAIL_HOST: ${EMAIL_HOST}
                         EMAIL_HOST_USER: ${EMAIL_HOST_USER}
@@ -53,7 +53,7 @@ services:
                 command: ./bin/worker
                 environment:
                         DJANGO_SETTINGS_MODULE: plane.settings.production
-                        DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@plane-db:5432/plane
+                        DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@${PGHOST}:5432/${PGDATABASE}
                         REDIS_URL: redis://plane-redis:6379/
                         EMAIL_HOST: ${EMAIL_HOST}
                         EMAIL_HOST_USER: ${EMAIL_HOST_USER}
@@ -81,7 +81,7 @@ services:
                 command: postgres -c 'max_connections=1000'
                 environment:
                         POSTGRES_USER: ${PGUSER}
-                        POSTGRES_DB: plane
+                        POSTGRES_DB: ${PGDATABASE}
                         POSTGRES_PASSWORD: ${PGPASSWORD}
                 volumes:
                         - pgdata:/var/lib/postgresql/data
diff --git a/docker-compose.yml b/docker-compose.yml
index 44252ad6a..85002ec5e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,7 +30,7 @@ services:
                 command: ./bin/takeoff
                 environment:
                         DJANGO_SETTINGS_MODULE: plane.settings.production
-                        DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@plane-db:5432/plane
+                        DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@${PGHOST}:5432/${PGDATABASE}
                         REDIS_URL: redis://redis:6379/
                         EMAIL_HOST: ${EMAIL_HOST}
                         EMAIL_HOST_USER: ${EMAIL_HOST_USER}
@@ -60,7 +60,7 @@ services:
                 command: ./bin/worker
                 environment:
                         DJANGO_SETTINGS_MODULE: plane.settings.production
-                        DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@plane-db:5432/plane
+                        DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@${PGHOST}:5432/${PGDATABASE}
                         REDIS_URL: redis://redis:6379/
                         EMAIL_HOST: ${EMAIL_HOST}
                         EMAIL_HOST_USER: ${EMAIL_HOST_USER}
@@ -91,11 +91,9 @@ services:
                         - pgdata:/var/lib/postgresql/data
                 environment:
                         POSTGRES_USER: ${PGUSER}
-                        POSTGRES_DB: plane
+                        POSTGRES_DB: ${PGDATABASE}
                         POSTGRES_PASSWORD: ${PGPASSWORD}
                         PGDATA: /var/lib/postgresql/data
-                ports:
-                        - 5432:5432
 
         plane-redis:
                 container_name: redis
@@ -103,8 +101,6 @@ services:
                 restart: always
                 volumes:
                         - redisdata:/data
-                ports:
-                        - 6379:6379
 
         plane-minio:
                 container_name: plane-minio
diff --git a/heroku.yml b/heroku.yml
new file mode 100644
index 000000000..e9d2ac033
--- /dev/null
+++ b/heroku.yml
@@ -0,0 +1,3 @@
+build:
+  docker:
+    web: deploy/heroku/Dockerfile
\ No newline at end of file