Merge pull request #310 from rohaizanr:fix-dev-env

(bug): Fix development environment

Author: rohaizanr

api/cadangan-api/Dockerfile

@@ -41,6 +41,7 @@ WORKDIR /app
 COPY --from=builder /app/cadangan-api .
 COPY --from=builder /app/wait-for-it.sh . 
 COPY --from=builder /app/docs ./docs
+COPY --from=builder /app/.env.* .
 
 # Expose the port that your application will run on
 EXPOSE $SERVER_PORT

api/cadangan-public-api/Dockerfile

@@ -40,6 +40,7 @@ WORKDIR /app
 # Copy only the built binary from the builder stage
 COPY --from=builder /app/cadangan-public-api .
 COPY --from=builder /app/wait-for-it.sh . 
+COPY --from=builder /app/.env.* .
 
 # Expose the port that your application will run on
 EXPOSE $SERVER_PORT

api/khairat-api/Dockerfile

@@ -39,6 +39,7 @@ WORKDIR /app
 
 # Copy only the built binary from the builder stage
 COPY --from=builder /app/khairat-api .
+COPY --from=builder /app/.env.* .
 COPY --from=builder /app/wait-for-it.sh . 
 COPY --from=builder /app/docs ./docs
 

docker-compose.yaml

@@ -12,43 +12,55 @@ services:
       - "5432:5432"
 
   khairat-api:
-    image: dev4w4n/emasjid-khairat-api:v2.1.1
+    image: dev4w4n/emasjid-khairat-api:v2.3.0
+    # build:
+    #   context: ./api/khairat-api
     environment:
-      - EMASJID_REACT_APP_BUILD_VERSION=v2.1.1
+      - EMASJID_REACT_APP_BUILD_VERSION=v2.3.0
       - EMASJID_REACT_APP_DOMAIN=e-masjid.my
+      - GO_ENV=local
     ports:
       - "8081:8081"
     depends_on:
       - postgres
     command: ["./wait-for-it.sh", "saas-api:8080", "--", "./khairat-api"]
 
   tabung-api:
-    image: dev4w4n/emasjid-tabung-api:v2.1.1
+    image: dev4w4n/emasjid-tabung-api:v2.3.0
+    # build:
+    #   context: ./api/tabung-api
     environment:
-      - EMASJID_REACT_APP_BUILD_VERSION=v2.1.1
+      - EMASJID_REACT_APP_BUILD_VERSION=v2.3.0
       - EMASJID_REACT_APP_DOMAIN=e-masjid.my
+      - GO_ENV=local
     ports:
       - "8082:8082"
     depends_on:
       - postgres
     command: ["./wait-for-it.sh", "saas-api:8080", "--", "./tabung-api"]
 
   cadangan-api:
-    image: dev4w4n/emasjid-cadangan-api:v2.1.1
+    image: dev4w4n/emasjid-cadangan-api:v2.3.0
+    # build:
+    #   context: ./api/cadangan-api
     environment:
-      - EMASJID_REACT_APP_BUILD_VERSION=v2.1.1
+      - EMASJID_REACT_APP_BUILD_VERSION=v2.3.0
       - EMASJID_REACT_APP_DOMAIN=e-masjid.my
+      - GO_ENV=local
     ports:
       - "8083:8083"
     depends_on:
       - postgres
     command: ["./wait-for-it.sh", "saas-api:8080", "--", "./cadangan-api"]
 
   cadangan-public-api:
-    image: dev4w4n/emasjid-cadangan-public-api:v2.1.1
+    image: dev4w4n/emasjid-cadangan-public-api:v2.3.0
+    # build:
+    #   context: ./api/cadangan-public-api
     environment:
-      - EMASJID_REACT_APP_BUILD_VERSION=v2.1.1
+      - EMASJID_REACT_APP_BUILD_VERSION=v2.3.0
       - EMASJID_REACT_APP_DOMAIN=e-masjid.my
+      - GO_ENV=local
     ports:
       - "8084:8084"
     depends_on:
@@ -57,31 +69,37 @@ services:
       ["./wait-for-it.sh", "saas-api:8080", "--", "./cadangan-public-api"]
 
   tetapan-api:
-    image: dev4w4n/emasjid-tetapan-api:v2.1.1
+    image: dev4w4n/emasjid-tetapan-api:v2.3.0
+    # build:
+    #   context: ./api/tetapan-api
     environment:
-      - EMASJID_REACT_APP_BUILD_VERSION=v2.1.1
+      - EMASJID_REACT_APP_BUILD_VERSION=v2.3.0
       - EMASJID_REACT_APP_DOMAIN=e-masjid.my
+      - GO_ENV=local
     ports:
       - "8085:8085"
     depends_on:
       - postgres
     command: ["./wait-for-it.sh", "saas-api:8080", "--", "./tetapan-api"]
 
   tetapan-public-api:
-    image: dev4w4n/emasjid-tetapan-public-api:v2.1.1
+    image: dev4w4n/emasjid-tetapan-public-api:v2.3.0
+    # build:
+    #   context: ./api/tetapan-public-api
     environment:
-      - EMASJID_REACT_APP_BUILD_VERSION=v2.1.1
+      - EMASJID_REACT_APP_BUILD_VERSION=v2.3.0
       - EMASJID_REACT_APP_DOMAIN=e-masjid.my
+      - GO_ENV=local
     ports:
       - "8086:8086"
     depends_on:
       - postgres
     command: ["./wait-for-it.sh", "saas-api:8080", "--", "./tetapan-public-api"]
 
   dashboard:
-    image: dev4w4n/emasjid-dashboard:v2.1.1
+    image: dev4w4n/emasjid-dashboard:v2.3.0
     environment:
-      - EMASJID_REACT_APP_BUILD_VERSION=v2.1.1
+      - EMASJID_REACT_APP_BUILD_VERSION=v2.3.0
       - EMASJID_REACT_APP_DOMAIN=e-masjid.my
     ports:
       - "3000:80"
@@ -92,19 +110,19 @@ services:
       - tetapan-api
 
   public-web:
-    image: dev4w4n/emasjid-public-web:v2.1.1
+    image: dev4w4n/emasjid-public-web:v2.3.0
     environment:
-      - EMASJID_REACT_APP_BUILD_VERSION=v2.1.1
+      - EMASJID_REACT_APP_BUILD_VERSION=v2.3.0
       - EMASJID_REACT_APP_DOMAIN=e-masjid.my
     ports:
       - "3001:80"
     depends_on:
       - cadangan-public-api
 
   saas-api:
-    image: dev4w4n/emasjid-saas:v2.1.1
+    image: dev4w4n/emasjid-saas:v2.3.0
     environment:
-      - EMASJID_REACT_APP_BUILD_VERSION=v2.1.1
+      - EMASJID_REACT_APP_BUILD_VERSION=v2.3.0
       - EMASJID_REACT_APP_DOMAIN=e-masjid.my
     ports:
       - "8080:8080"
@@ -118,7 +136,7 @@ services:
   #   ports:
   #     - "4000:4000"
   #   environment:
-  #     - GO_ENV=dev
+  #     - GO_ENV=local
   #   depends_on:
   #     - tabung-api
   #     - cadangan-api