chore: update single click deployments (#1141)

* chore: update single click deployments * dev: update environment variables
makeplane · May 26, 2023 · cd821a9 · cd821a9
1 parent f80b3f1
commit cd821a9
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 23 deletions.
diff --git 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
diff --git 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
@@ -0,0 +1,4 @@
+# Deploy the Plane image
+FROM makeplane/plane
+
+LABEL maintainer="engineering@plane.so"
diff --git 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
@@ -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,20 +91,16 @@ 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
                 image: redis:6.2.7-alpine
                 restart: always
                 volumes:
                         - redisdata:/data
-                ports:
-                        - 6379:6379
 
         plane-minio:
                 container_name: plane-minio

diff --git a/heroku.yml b/heroku.yml
@@ -0,0 +1,3 @@
+build:
+  docker:
+    web: deploy/heroku/Dockerfile