Merge pull request #34 from FloRobart/dev

fix(docker compose): Fix details and bugs in docker compose (prod and dev)

Author: FloRobart

docker-compose.dev.yml

@@ -73,10 +73,9 @@ services:
       - ${FLORACCESS_SERVER_PORT:-}:80
     volumes:
       - ./FlorAccess_server:/app/
-      - ./FlorAccess_server/node_modules:/app/node_modules
     command: ["npm", "run", "dev"]
     tmpfs:
-      - /app/src/swagger/json:rw,uid=1800,gid=1800
+      - /tmp:exec,nosuid,nodev
     healthcheck:
       test: ["CMD-SHELL", "wget -q --spider http://floraccess-server:80/ || exit 1"]
       interval: 10s
@@ -99,10 +98,9 @@ services:
       - ${ECONORIS_SERVER_PORT:-}:80
     volumes:
       - ./Econoris_server:/app/
-      - ./Econoris_server/node_modules:/app/node_modules
     command: ["npm", "run", "dev"]
     tmpfs:
-      - /app/src/swagger/json:rw,uid=1800,gid=1800
+      - /tmp:exec,nosuid,nodev
     healthcheck:
       test: ["CMD-SHELL", "wget -q --spider http://econoris-server:80/ || exit 1"]
       interval: 10s
@@ -125,10 +123,9 @@ services:
       - ${FLOLLYLIST_SERVER_PORT:-}:80
     volumes:
       - ./FlollyList_server:/app/
-      - ./FlollyList_server/node_modules:/app/node_modules
     command: ["npm", "run", "dev"]
     tmpfs:
-      - /app/src/swagger/json:rw,uid=1800,gid=1800
+      - /tmp:exec,nosuid,nodev
     healthcheck:
       test: ["CMD-SHELL", "wget -q --spider http://flollylist-server:80/ || exit 1"]
       interval: 10s
@@ -142,6 +139,7 @@ services:
   # Econoris App Web #
   econoris-app-web:
     image: nginx:stable-alpine
+    working_dir: /app
     env_file:
       - ./config/.env.econoris_app
     networks:
@@ -158,13 +156,13 @@ services:
       - ./econoris_app/nginx.conf:/etc/nginx/conf.d/default.conf
       - ./config/.env.econoris_app:/usr/share/nginx/html/assets/.env:ro
     command: ["nginx", "-g", "daemon off;"]
-    working_dir: /app
     environment:
       - FLUTTER_ENV=dev
 
   # FlollyList App Web #
   flollylist-app-web:
     image: nginx:stable-alpine
+    working_dir: /app
     env_file:
       - ./config/.env.flollylist_app
     networks:
@@ -181,20 +179,19 @@ services:
       - ./flollylist_app/nginx.conf:/etc/nginx/conf.d/default.conf
       - ./config/.env.flollylist_app:/usr/share/nginx/html/assets/.env:ro
     command: ["nginx", "-g", "daemon off;"]
-    working_dir: /app
     environment:
       - FLUTTER_ENV=dev
 
+  # Flower garden app #
   flower-garden-app:
     image: node:24-alpine
     working_dir: /app
     env_file: ./config/.env.flower_garden_app
     networks:
       - flower-garden-net
     volumes:
-      - ./:/app/
-      - ./node_modules:/app/node_modules
-    command: sh -c "cd /app && npm run dev"
+      - ./Flower_garden_app:/app/
+    command: ["npm", "run", "dev"]
     ports:
       - ${FLOWER_GARDEN_APP_PORT:-}:80
     user: "1800:1800"

docker-compose.yml

@@ -63,6 +63,7 @@ services:
   # FlorAccess Server #
   floraccess-server:
     image: florobart/floraccess-server:latest
+    working_dir: /app
     restart: always
     env_file:
       - ./config/.env.floraccess_server
@@ -84,7 +85,6 @@ services:
     user: "1800:1800"
     tmpfs:
       - /tmp:exec,nosuid,nodev
-      - /app/dist/swagger/:rw,uid=1800,gid=1800
     healthcheck:
       test: ["CMD-SHELL", "wget -q --spider http://floraccess-server:80/ || exit 1"]
       interval: 10s
@@ -94,6 +94,7 @@ services:
   # Econoris Server #
   econoris-server:
     image: florobart/econoris-server:latest
+    working_dir: /app
     restart: always
     env_file:
       - ./config/.env.econoris_server
@@ -115,7 +116,6 @@ services:
     user: "1800:1800"
     tmpfs:
       - /tmp:exec,nosuid,nodev
-      - /app/dist/swagger/:rw,uid=1800,gid=1800
     healthcheck:
       test: ["CMD-SHELL", "wget -q --spider http://econoris-server:80/ || exit 1"]
       interval: 10s
@@ -125,6 +125,7 @@ services:
   # FlollyList Server #
   flollylist-server:
     image: florobart/flollylist-server:latest
+    working_dir: /app
     restart: always
     env_file:
       - ./config/.env.flollylist_server
@@ -146,7 +147,6 @@ services:
     user: "1800:1800"
     tmpfs:
       - /tmp:exec,nosuid,nodev
-      - /app/dist/swagger/:rw,uid=1800,gid=1800
     healthcheck:
       test: ["CMD-SHELL", "wget -q --spider http://flollylist-server:80/ || exit 1"]
       interval: 10s
@@ -248,8 +248,8 @@ services:
   # Flower garden app #
   flower-garden-app:
     image: florobart/flower-garden-app:latest
-    restart: always
     working_dir: /app
+    restart: always
     env_file:
       - ./config/.env.flower_garden_app
     networks:
@@ -266,7 +266,7 @@ services:
     user: "1800:1800"
     tmpfs:
       - /tmp:exec,nosuid,nodev,uid=1800,gid=1800
-      - /app/${DIR_CACHE_PATH}/:rw,uid=1800,gid=1800
+      - /app/${FLOWER_GARDEN_DIR_CACHE_PATH}/:rw,uid=1800,gid=1800
     healthcheck:
       test: ["CMD-SHELL", "wget -q --spider http://flower-garden-app:80/ || exit 1"]
       interval: 10s

version

@@ -1 +1 @@
-1.5.1
+1.5.2