use specified Dockerfiles for compose build

Taskfile.yml

@@ -1,24 +1,29 @@
+# https://taskfile.dev
 version: '3'
 
 tasks:
   build:
-    desc: Build all source files
+    desc: Build Docker images for Mocha
     cmds:
       - ninja
+      - docker compose -f compose/docker-compose.prod.yml build
 
-  start:
-    desc: Bring up all Docker containers
-    dir: '{{.USER_WORKING_DIR}}'
-    preconditions:
-      - test -f docker-compose.yml
+  run:
+    desc: Spin up a temporary Mocha instance in Docker for development
     cmds:
-      - docker compose up -d
+      - ninja
+      - docker compose -f compose/docker-compose.dev.yml up
 
-  stop:
-    desc: Bring down all Docker containers
-    dir: '{{.USER_WORKING_DIR}}'
-    preconditions:
-      - test -f docker-compose.yml
+  new:
+    desc: Create a new Mochafile
     cmds:
-      - docker compose down
+      - cp compose/docker-compose.dev.yml docker-compose.yml
+      - touch Mochafile
 
+  clean:
+    desc: Bring down all development Docker containers
+    dir: '{{.USER_WORKING_DIR}}'
+    #preconditions:
+    #  - test -f docker-compose.yml
+    cmds:
+      - docker compose -f compose/docker-compose.dev.yml down

compose/docker-compose.dev.yml

@@ -17,6 +17,9 @@
 services:
   # mocha-oms runs the Object Management Service which loads MCL/MCX libraries and snapshots and provides an API to be consumed by mochaui-tenant.
   mocha-oms:
+    build:
+      context: ..
+      dockerfile: dockerfiles/oms-prod.Dockerfile
     image: mcr.microsoft.com/dotnet/runtime:8.0
     command: dotnet /oms/Mocha.Oms.Server.dll
     environment:
@@ -29,14 +32,15 @@ services:
     networks:
       - app-tenant
     volumes:
-      - ./mocha-dotnet/mocha-dotnet/src/app/Mocha.Oms.Server/bin/Debug/net8.0:/oms
-      - ./mocha-dotnet/mocha-common/mocha-common/output:/usr/share/mocha/system
+      - ../mocha-dotnet/mocha-dotnet/src/app/Mocha.Oms.Server/bin/Debug/net8.0:/oms
+      - ../mocha-dotnet/mocha-common/mocha-common/output:/usr/share/mocha/system
       
   # mochaui-tenant runs the PHP for the Mocha User Interface Service. it communicates with the OMS via API calls on the specified port.
-  mochaui-tenant:
+  mocha-uis:
     build:
-      context: .
-      dockerfile: ./dockerfiles/tenant.Dockerfile
+      context: ..
+      dockerfile: dockerfiles/uis-prod.Dockerfile
+    image: mochapowered/mochaui-tenant:latest
     environment:
       VIRTUAL_HOST: localhost
       # OMS_TYPE: mysql
@@ -54,17 +58,17 @@ services:
     networks:
       - app-tenant
     volumes:
-      - ./mocha-php/mocha-php/src/mocha-php:/var/www/html
-      - ./mocha-php/phast/lib/phast/server:/usr/local/lib/php/lib/phast
-      - ./mocha-php/phast/lib/phast/client/scripts:/var/www/html/scripts/phast
-      - ./mocha-dotnet/mocha-common/mocha-common/data/uploads:/var/mocha/uploads
-      - ./uwt-web/src/uwt-web/fonts/awesome/webfonts:/var/www/html/webfonts
+      - ../mocha-php/mocha-php/src/mocha-php:/var/www/html
+      - ../mocha-php/phast/lib/phast/server:/usr/local/lib/php/lib/phast
+      - ../mocha-php/phast/lib/phast/client/scripts:/var/www/html/scripts/phast
+      - ../mocha-dotnet/mocha-common/mocha-common/data/uploads:/var/mocha/uploads
+      - ../uwt-web/src/uwt-web/fonts/awesome/webfonts:/var/www/html/webfonts
     
   static:
     image: nginx:alpine
     volumes:
-      - ./uwt-web/output:/usr/share/nginx/html
-      - ./uwt-web/src/uwt-web/fonts:/usr/share/nginx/html/fonts
+      - ../uwt-web/output:/usr/share/nginx/html
+      - ../uwt-web/src/uwt-web/fonts:/usr/share/nginx/html/fonts
     networks:
       - app-tenant
       - app-manager
@@ -82,9 +86,10 @@ services:
     - "3333:80"
     volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ./vhost-tenant.d:/etc/nginx/vhost.d:ro
+    - ../vhost-tenant.d:/etc/nginx/vhost.d:ro
 
 networks:
     proxy:
     app-tenant:
     app-manager:
+

compose/docker-compose.prod.yml

@@ -0,0 +1,71 @@
+services:
+  mocha-oms:
+    build:
+      context: ..
+      dockerfile: dockerfiles/oms-prod.Dockerfile
+    image: mochapowered/mocha-oms
+    networks:
+      - app-tenant
+      
+  mocha-uis:
+    build:
+      context: ..
+      dockerfile: dockerfiles/uis-prod.Dockerfile
+    image: mochapowered/mocha-uis:latest
+    environment:
+      VIRTUAL_HOST: localhost
+      # OMS_TYPE: mysql
+      # OMS_SERVERNAME: db
+      # OMS_SERVERPORT: 3306
+      # OMS_DATABASENAME: mochadb
+      # OMS_USERNAME: mochadb
+      # OMS_PASSWORD: '93X37B]@k(svLmFM'
+      OMS_TYPE: api
+      OMS_SERVERNAME: mocha-oms
+      OMS_SERVERPORT: 4436
+      THEMES_PATH: /css/themes/{ThemeName}.css
+      COMMON_THEMES_PATH: /css/common.css
+      # # THEMES_PATH: /themes/{ThemeName}/theme.css
+    networks:
+      - app-tenant
+
+    
+  static:
+    image: nginx:alpine
+    volumes:
+      - ./uwt-web/output:/usr/share/nginx/html
+      - ./uwt-web/src/uwt-web/fonts:/usr/share/nginx/html/fonts
+    networks:
+      - app-tenant
+      - app-manager
+      
+  #nginx-proxy-manager:
+  #  depends_on:
+  #    - static
+  #    - mochaui-manager
+  #    - phpmyadmin
+  #  image: jwilder/nginx-proxy
+  #  ports:
+  #  - "8082:80"
+  #  volumes:
+  #  - /var/run/docker.sock:/tmp/docker.sock:ro
+  #  - ./vhost-manager.d:/etc/nginx/vhost.d:ro
+    
+  nginx-proxy-tenant:
+    depends_on:
+      - static
+      - mocha-oms
+    image: jwilder/nginx-proxy
+    networks:
+      - app-tenant
+      - proxy
+    ports:
+    - "3333:80"
+    volumes:
+    - /var/run/docker.sock:/tmp/docker.sock:ro
+    - ./vhost-tenant.d:/etc/nginx/vhost.d:ro
+
+networks:
+    proxy:
+    app-tenant:
+    app-manager:

dockerfiles/oms-prod.Dockerfile

@@ -0,0 +1,6 @@
+FROM mcr.microsoft.com/dotnet/runtime:8.0
+
+COPY ./mocha-dotnet/mocha-dotnet/src/app/Mocha.Oms.Server/bin/Debug/net8.0 /oms
+COPY ./mocha-dotnet/mocha-common/mocha-common/output /usr/share/mocha/system
+
+ENTRYPOINT dotnet /oms/Mocha.Oms.Server.dll

dockerfiles/tenant.Dockerfile

@@ -1,3 +0,0 @@
-FROM php:8.2-apache
-
-RUN a2enmod rewrite

dockerfiles/uis-prod.Dockerfile

@@ -0,0 +1,9 @@
+FROM php:8.2-apache
+
+RUN a2enmod rewrite
+
+COPY ./mocha-php/mocha-php/src/mocha-php /var/www/html
+COPY ./mocha-php/phast/lib/phast/server /usr/local/lib/php/lib/phast
+COPY ./mocha-php/phast/lib/phast/client/scripts /var/www/html/scripts/phast
+COPY ./mocha-dotnet/mocha-common/mocha-common/data/uploads /var/mocha/uploads
+COPY ./uwt-web/src/uwt-web/fonts/awesome/webfonts /var/www/html/webfonts

mocha-dotnet

@@ -1 +1 @@
-Subproject commit 4938eaaa445cd5c859316f11ca03b55bbe5f9da8
+Subproject commit 1c5e538b7dc8a75b8a666b1b8c30816c65637460

mocha-php

@@ -1 +1 @@
-Subproject commit 4da713ae56ef2b2a41aa2783aa5b5e1bd301db5d
+Subproject commit b577db2af4a01d284f68fc12af6fa63b0d7ef635