From ff5789199383e1f4fad925a655f66b7f5100ab2d Mon Sep 17 00:00:00 2001
From: Dejan Zdravkovic <dejan.zdravkovic@protonmail.com>
Date: Sun, 22 Dec 2024 19:24:55 +0100
Subject: [PATCH] env vars

---
 README.md                              | 4 ----
 backend/spring-boot/docker-compose.yml | 6 +++---
 docker-compose.yml                     | 8 ++++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 9851cc1a..11ac8674 100644
--- a/README.md
+++ b/README.md
@@ -33,18 +33,14 @@ Login credentials:
 | API_URL                  | URL on which API is running                                           | http://bootstrapbugz-api:8080/v1 |
 | UI_URL                   | URL on which UI is running                                            | http://bootstrapbugz-ui:5173     |
 | UI_PORT                  | Port on which you'll find UI running                                  | 5173                             |
-| EXPOSED_UI_PORT          | Port on which UI will be exposed when running via docker              | 5174                             |
 | SERVER_PORT              | Port on which you'll find API running                                 | 8080                             |
-| EXPOSED_SERVER_PORT      | Port on which API will be exposed when running via docker             | 8081                             |
 | POSTGRES_HOST            | Host on which postgres is running, used when locally starting the API | localhost                        |
 | POSTGRES_PORT            | Port on which you'll find postgres running                            | 5432                             |
-| EXPOSED_POSTGRES_PORT    | Port on which postgres will be exposed when running via docker        | 5433                             |
 | POSTGRES_DATABASE        | Name of the postgres database                                         | bootstrapbugz                    |
 | POSTGRES_USERNAME        | Postgres username                                                     | postgres                         |
 | POSTGRES_PASSWORD        | Postgres password                                                     | root                             |
 | REDIS_HOST               | Host on which redis is running, used when locally starting the API    | 127.0.0.1                        |
 | REDIS_PORT               | Port on which you'll find redis running                               | 6379                             |
-| EXPOSED_REDIS_PORT       | Port on which redis will be exposed when running via docker           | 6380                             |
 | REDIS_DATABASE           | Name of the redis database                                            | 0                                |
 | REDIS_PASSWORD           | Redis password                                                        | root                             |
 | MAIL_HOST                | SMTP host                                                             | smtp.mailgun.org                 |
diff --git a/backend/spring-boot/docker-compose.yml b/backend/spring-boot/docker-compose.yml
index 3ed0cc67..1e454e09 100644
--- a/backend/spring-boot/docker-compose.yml
+++ b/backend/spring-boot/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     image: bootstrapbugz-api:1.0.0
     build: .
     ports:
-      - "${EXPOSED_SERVER_PORT:-8081}:${SERVER_PORT:-8080}"
+      - "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}"
     environment:
       APP_NAME: ${APP_NAME:-BootstrapBugZ}
       SERVER_PORT: ${SERVER_PORT:-8080}
@@ -41,7 +41,7 @@ services:
     container_name: postgres
     image: postgres:17.2-alpine
     ports:
-      - "${EXPOSED_POSTGRES_PORT:-5433}:${POSTGRES_PORT:-5432}"
+      - "${POSTGRES_PORT:-5432}:${POSTGRES_PORT:-5432}"
     environment:
       PGPORT: ${POSTGRES_PORT:-5432}
       POSTGRES_DB: ${POSTGRES_DATABASE:-bootstrapbugz}
@@ -65,7 +65,7 @@ services:
     container_name: redis
     image: redis:7.4.1
     ports:
-      - "${EXPOSED_REDIS_PORT:-6380}:${REDIS_PORT:-6379}"
+      - "${REDIS_PORT:-6379}:${REDIS_PORT:-6379}"
     command: redis-server --port ${REDIS_PORT:-6379} --requirepass ${REDIS_PASSWORD:-root}
     environment:
       REDIS_DATABASE: ${REDIS_DATABASE:-0}
diff --git a/docker-compose.yml b/docker-compose.yml
index cb0aca7e..d9a02f95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       context: ./backend/spring-boot
       dockerfile: Dockerfile
     ports:
-      - "${EXPOSED_SERVER_PORT:-8081}:${SERVER_PORT:-8080}"
+      - "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}"
     environment:
       APP_NAME: ${APP_NAME:-BootstrapBugZ}
       SERVER_PORT: ${SERVER_PORT:-8080}
@@ -43,7 +43,7 @@ services:
     container_name: postgres
     image: postgres:17.2-alpine
     ports:
-      - "${EXPOSED_POSTGRES_PORT:-5433}:${POSTGRES_PORT:-5432}"
+      - "${POSTGRES_PORT:-5432}:${POSTGRES_PORT:-5432}"
     environment:
       PGPORT: ${POSTGRES_PORT:-5432}
       POSTGRES_DB: ${POSTGRES_DATABASE:-bootstrapbugz}
@@ -67,7 +67,7 @@ services:
     container_name: redis
     image: redis:7.4.1
     ports:
-      - "${EXPOSED_REDIS_PORT:-6380}:${REDIS_PORT:-6379}"
+      - "${REDIS_PORT:-6379}:${REDIS_PORT:-6379}"
     command: redis-server --port ${REDIS_PORT:-6379} --requirepass ${REDIS_PASSWORD:-root}
     environment:
       REDIS_DATABASE: ${REDIS_DATABASE:-0}
@@ -100,7 +100,7 @@ services:
       PUBLIC_API_URL: ${API_URL:-http://bootstrapbugz-api:8080/v1}
       JWT_SECRET: ${JWT_SECRET:-secret}
     ports:
-      - "${EXPOSED_UI_PORT:-5174}:${UI_PORT:-5173}"
+      - "${UI_PORT:-5173}:${UI_PORT:-5173}"
     depends_on:
       - bootstrapbugz-api
     healthcheck: