fixing env

docker-compose.nas.yml

@@ -4,11 +4,12 @@ services:
     build:
       context: ./frontend
     image: pdelebarre/guitar-tutorial-app-frontend
+    # :${BUILD_ENV:-dev}
+    environment:
+      - GUITARTUTORIALAPP_API_BASE_URL=http://backend
+      - GUITARTUTORIALAPP_API_PORT=8080
     ports:
       - "3000:80"
-    environment:
-      # Set VITE_API_URL to the internal backend service name inside Docker
-      - VITE_API_URL=http://backend:8080
     depends_on:
       - backend
     networks:

docker-compose.prod.yml.test

@@ -0,0 +1,37 @@
+version: '3.8'
+
+services:
+  backend:
+    depends_on:
+      - postgres  # Only in prod mode
+
+  postgres:
+    image: postgres:15-alpine
+    container_name: postgres
+    environment:
+      POSTGRES_USER: myuser          # Creates the "myuser" role
+      POSTGRES_PASSWORD: mypassword  # Password for "myuser"
+      POSTGRES_DB: guitardb          # Creates the "guitardb" database
+      # Set the profile to prod and connect to Postgres
+      SPRING_PROFILES_ACTIVE: prod
+      SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/guitardb
+      SPRING_DATASOURCE_USERNAME: myuser
+      SPRING_DATASOURCE_PASSWORD: mypassword
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    networks:
+      - guitartuto-network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U myuser -d guitardb"]
+      interval: 10s
+      retries: 5
+      start_period: 5s
+
+networks:
+  guitartuto-network:
+    driver: bridge
+
+volumes:
+  postgres_data:

docker-compose.yml

@@ -26,10 +26,7 @@ services:
     build:
       context: ./frontend
     image: pdelebarre/guitar-tutorial-app-frontend
-    # :${BUILD_ENV:-dev}
-    environment:
-      - GUITARTUTORIALAPP_API_BASE_URL=$GUITARTUTORIALAPP_API_BASE_URL
-      - GUITARTUTORIALAPP_API_PORT=$GUITARTUTORIALAPP_API_PORT
+
     ports:
       - "3000:80"
     depends_on:

frontend/.env

@@ -0,0 +1,3 @@
+VITE_API_BASE_URL=http://backend
+VITE_API_PORT=8080
+# VITE_ENVIRONMENT=DEVELOPMENT

frontend/Dockerfile

@@ -24,8 +24,9 @@ COPY --from=builder /app/dist /usr/share/nginx/html
 
 #shell to be able to catch variables at docker run time
 #https://dev.to/sanjayttg/dynamic-environment-variables-for-dockerized-react-apps-5bc5
-COPY env.sh /docker-entrypoint.d/env.sh
-RUN chmod +x /docker-entrypoint.d/env.sh
+# COPY env.sh /docker-entrypoint.d/env.sh
+# RUN chmod +x /docker-entrypoint.d/env.sh
+COPY .env .env
 
 # Expose the port NGINX is running on
 EXPOSE 80