update docker config,

002_source/docker/dc.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -ex
+
+
+docker compose \
+  -f docker-compose.yml \
+  -f docker-compose.db.yml \
+  $@

002_source/docker/docker-compose.db.yml

@@ -7,9 +7,9 @@ volumes:
 
 services:
   pocketbase:
-    # image: ghcr.io/muchobien/pocketbase:latest
+    image: 192.168.10.61:5000/demo_cms_pocketbase:latest
     build:
-      context: ./pocketbase/docker
+      context: ../pocketbase/docker
       args:
         - VERSION=0.26.6 # Specify the PocketBase version here
     # hostname: pocketbase
@@ -27,12 +27,12 @@ services:
       - ../pocketbase/pb_hooks:/pb_hooks
 
     # TODO: resume healthcheck in prod
-    # healthcheck:
+    healthcheck:
-    #   #optional (recommended) since v0.10.0
+      #optional (recommended) since v0.10.0
-    #   test: wget --no-verbose --tries=1 --spider http://localhost:8090/api/health || exit 1
+      test: wget --no-verbose --tries=1 --spider http://localhost:8090/api/health || exit 1
-    #   interval: 5s
+      interval: 5s
-    #   timeout: 5s
+      timeout: 5s
-    #   retries: 5
+      retries: 5
 
     deploy:
       resources:

002_source/docker/docker-compose.yml

@@ -1,22 +1,20 @@
-volumes:
-  shared:
-  dist:
-
 services:
   cms:
-    image: 192.168.10.61:5000/cms_ubuntu
+    image: 192.168.10.61:5000/demo_cms_ubuntu
-    # build: ./cms
+    build: ../cms
     env_file:
       - .env
     volumes:
-      - ./cms:/app
+      - ../cms:/app
     ports:
       - 3000:3000
     working_dir: /app
-    command: ./scripts/docker/entrypoint.sh
+    # command: /app/scripts/docker/entrypoint.sh
+    command: sleep infinity
     depends_on:
       pocketbase:
         condition: service_healthy
+    user: 1000:1000
     healthcheck:
       #optional (recommended) since v0.10.0
       test: wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1
@@ -30,81 +28,16 @@ services:
         reservations:
           cpus: '0.01'
 
-  doc:
+  # doc:
-    build: ./doc
+  #   build: ../doc
-    env_file:
-      - .env
-    volumes:
-      - ./doc:/app
-    ports:
-      - 3001:3000
-    working_dir: /app
-    command: ./scripts/docker/entrypoint.sh
-    healthcheck:
-      #optional (recommended) since v0.10.0
-      test: wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1
-      interval: 5s
-      timeout: 5s
-      retries: 5
-
-    deploy:
-      resources:
-        limits:
-          cpus: '0.5'
-        reservations:
-          cpus: '0.01'
-
-  ionic_mobile:
-    # image: node:20-bullseye-slim
-    # build: ./ionic_mobile
-    image: 192.168.10.61:5000/ionic_mobile_ubuntu
-    # user: 1000:1000
-    env_file:
-      - .env
-    volumes:
-      - ./ionic_mobile:/app
-    ports:
-      - 5173:5173
-    working_dir: /app
-    command: ./scripts/docker/entrypoint.sh
-    depends_on:
-      pocketbase:
-        condition: service_healthy
-    healthcheck:
-      #optional (recommended) since v0.10.0
-      test: wget --no-verbose --tries=1 --spider http://localhost:5173 || exit 1
-      interval: 5s
-      timeout: 5s
-      retries: 5
-
-    deploy:
-      resources:
-        limits:
-          cpus: '0.5'
-        reservations:
-          cpus: '0.01'
-
-  api_ts:
-    # TODO: review this config, the api_ts volumes should be place inside 002_source/docker/volumes
-    image: 192.168.10.61:5000/api_ts_ubuntu
-    # build: ./api_ts
-    volumes:
-      - ../api_ts:/app
-    working_dir: /app
   #   env_file:
   #     - .env
-    environment:
+  #   volumes:
-      - NODE_ENV=production
+  #     - ./doc:/app
-      - PB_HOSTNAME=pocketbase
+  #   ports:
-      - PB_USERNAME=admin@123.com
+  #     - 3001:3000
-      - PB_PASSWORD=Aa12345678
+  #   working_dir: /app
-    ports:
+  #   command: ./scripts/docker/entrypoint.sh
-      - 8080:3000
-    # command: sleep infinity
-    command: ./entrypoint.sh
-    # depends_on:
-    #   pocketbase:
-    #     condition: service_healthy
   #   healthcheck:
   #     #optional (recommended) since v0.10.0
   #     test: wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1
@@ -112,9 +45,75 @@ services:
   #     timeout: 5s
   #     retries: 5
 
-    deploy:
+  #   deploy:
-      resources:
+  #     resources:
-        limits:
+  #       limits:
-          cpus: 0.5
+  #         cpus: '0.5'
-        reservations:
+  #       reservations:
-          cpus: 0.01
+  #         cpus: '0.01'
+
+  # api_ts:
+  #   # TODO: review this config, the api_ts volumes should be place inside 002_source/docker/volumes
+  #   # image: 192.168.10.61:5000/api_ts_ubuntu
+  #   build: ../api_ts
+  #   volumes:
+  #     - ../api_ts:/app
+  #   working_dir: /app
+  #   # env_file:
+  #   #   - .env
+  #   environment:
+  #     - NODE_ENV=production
+  #     - PB_HOSTNAME=pocketbase
+  #     - PB_USERNAME=admin@123.com
+  #     - PB_PASSWORD=Aa12345678
+  #   ports:
+  #     - 8080:3000
+  #   # command: sleep infinity
+  #   command: ./entrypoint.sh
+  #   # depends_on:
+  #   #   pocketbase:
+  #   #     condition: service_healthy
+  #   # healthcheck:
+  #   #   #optional (recommended) since v0.10.0
+  #   #   test: wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1
+  #   #   interval: 5s
+  #   #   timeout: 5s
+  #   #   retries: 5
+
+  #   deploy:
+  #     resources:
+  #       limits:
+  #         cpus: 0.5
+  #       reservations:
+  #         cpus: 0.01
+
+  # ionic_mobile:
+  #   # image: node:20-bullseye-slim
+  #   image: 192.168.10.61:5000/demo_ionic_mobile
+  #   build: ../ionic_mobile
+  #   # user: 1000:1000
+  #   env_file:
+  #     - .env
+  #   volumes:
+  #     - ../ionic_mobile:/app
+  #   ports:
+  #     - 5173:5173
+  #     - 8081:8080
+  #   working_dir: /app
+  #   command: /app/scripts/docker/entrypoint.sh
+  #   depends_on:
+  #     pocketbase:
+  #       condition: service_healthy
+  #   healthcheck:
+  #     #optional (recommended) since v0.10.0
+  #     test: wget --no-verbose --tries=1 --spider http://localhost:5173 || exit 1
+  #     interval: 5s
+  #     timeout: 5s
+  #     retries: 5
+
+  #   deploy:
+  #     resources:
+  #       limits:
+  #         cpus: '0.5'
+  #       reservations:
+  #         cpus: '0.01'