From 7087b1b5f2f67392704aaca488f85a4cb3760265 Mon Sep 17 00:00:00 2001
From: Quadrubo <71718414+Quadrubo@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:40:57 +0200
Subject: [PATCH] fix: docker inconsistencies (#1493)

Co-authored-by: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com>
---
 docker-compose-hub.yml | 39 +++++++++++++++++++--------------------
 docker-compose.yml     |  4 ++--
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/docker-compose-hub.yml b/docker-compose-hub.yml
index cc4fe690b..16f2bbd86 100644
--- a/docker-compose-hub.yml
+++ b/docker-compose-hub.yml
@@ -31,7 +31,6 @@ x-api-and-worker-env: &api-and-worker-env
         USE_MINIO: ${USE_MINIO}
         ENABLE_SIGNUP: ${ENABLE_SIGNUP}
 
-
 services:
         plane-web:
                 container_name: planefrontend
@@ -42,12 +41,14 @@ services:
                         - .env
                 environment:
                         NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
-                        NEXT_PUBLIC_GOOGLE_CLIENTID: 0
-                        NEXT_PUBLIC_GITHUB_APP_NAME: 0
-                        NEXT_PUBLIC_GITHUB_ID: 0
-                        NEXT_PUBLIC_SENTRY_DSN: 0
-                        NEXT_PUBLIC_ENABLE_OAUTH: 0
-                        NEXT_PUBLIC_ENABLE_SENTRY: 0
+                        NEXT_PUBLIC_GOOGLE_CLIENTID: "0"
+                        NEXT_PUBLIC_GITHUB_APP_NAME: "0"
+                        NEXT_PUBLIC_GITHUB_ID: "0"
+                        NEXT_PUBLIC_SENTRY_DSN: "0"
+                        NEXT_PUBLIC_ENABLE_OAUTH: "0"
+                        NEXT_PUBLIC_ENABLE_SENTRY: "0"
+                        NEXT_PUBLIC_ENABLE_SESSION_RECORDER: "0"
+                        NEXT_PUBLIC_TRACK_EVENTS: "0"
                 depends_on:
                         - plane-api
                         - plane-worker
@@ -66,7 +67,7 @@ services:
                         - plane-redis
 
         plane-worker:
-                container_name: planerqworker
+                container_name: planebgworker
                 image: makeplane/plane-worker:latest
                 restart: always
                 command: ./bin/worker
@@ -84,14 +85,15 @@ services:
                 image: postgres:15.2-alpine
                 restart: always
                 command: postgres -c 'max_connections=1000'
+                volumes:
+                        - pgdata:/var/lib/postgresql/data
                 env_file:
                         - .env
                 environment:
                         POSTGRES_USER: ${PGUSER}
                         POSTGRES_DB: ${PGDATABASE}
                         POSTGRES_PASSWORD: ${PGPASSWORD}
-                volumes:
-                        - pgdata:/var/lib/postgresql/data
+                        PGDATA: /var/lib/postgresql/data
 
         plane-redis:
                 container_name: plane-redis
@@ -103,9 +105,10 @@ services:
         plane-minio:
                 container_name: plane-minio
                 image: minio/minio
+                restart: always
+                command: server /export --console-address ":9090"
                 volumes:
                         - uploads:/export
-                command: server /export --console-address ":9090"
                 env_file:
                         - .env
                 environment:
@@ -115,23 +118,20 @@ services:
         createbuckets:
                 image: minio/mc
                 entrypoint: >
-                  /bin/sh -c "
-                  /usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY;
-                  /usr/bin/mc mb plane-minio/\$AWS_S3_BUCKET_NAME;
-                  /usr/bin/mc anonymous set download plane-minio/\$AWS_S3_BUCKET_NAME;
-                  exit 0;
-                  "
+                        /bin/sh -c " /usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY; 
+                        /usr/bin/mc mb plane-minio/\$AWS_S3_BUCKET_NAME; 
+                        /usr/bin/mc anonymous set download plane-minio/\$AWS_S3_BUCKET_NAME; exit 0; "
                 env_file:
                         - .env
                 depends_on:
                         - plane-minio
 
-# Comment this if you already have a reverse proxy running
+        # Comment this if you already have a reverse proxy running
         plane-proxy:
                 container_name: planeproxy
                 image: makeplane/plane-proxy:latest
                 ports:
-                - ${NGINX_PORT}:80
+                        - ${NGINX_PORT}:80
                 env_file:
                         - .env
                 environment:
@@ -141,7 +141,6 @@ services:
                         - plane-web
                         - plane-api
 
-
 volumes:
         pgdata:
         redisdata:
diff --git a/docker-compose.yml b/docker-compose.yml
index 496ee434d..a8cf39113 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,7 @@ services:
                         args:
                                 NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
                 restart: always
-                command: [ "/usr/local/bin/start.sh" ]
+                command: /usr/local/bin/start.sh
                 env_file:
                         - .env
                 environment:
@@ -57,7 +57,6 @@ services:
                         - plane-api
                         - plane-worker
 
-
         plane-api:
                 container_name: planebackend
                 build:
@@ -135,6 +134,7 @@ services:
                 depends_on:
                         - plane-minio
 
+        # Comment this if you already have a reverse proxy running
         plane-proxy:
                 container_name: planeproxy
                 build: