update mocha-dotnet and add Taskfile.yml support

This commit is contained in:
Michael Becker 2025-07-30 13:59:23 -04:00
parent 8d029e450c
commit 4de811ae4a
3 changed files with 47 additions and 16 deletions

24
Taskfile.yml Normal file
View File

@ -0,0 +1,24 @@
version: '3'
tasks:
build:
desc: Build all source files
cmds:
- ninja
start:
desc: Bring up all Docker containers
dir: '{{.USER_WORKING_DIR}}'
preconditions:
- test -f docker-compose.yml
cmds:
- docker compose up -d
stop:
desc: Bring down all Docker containers
dir: '{{.USER_WORKING_DIR}}'
preconditions:
- test -f docker-compose.yml
cmds:
- docker compose down

View File

@ -1,20 +1,38 @@
# docker-compose for Mocha
# Copyright (C) 2025 Michael Becker <alcexhim@gmail.com>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
services: 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: mocha-oms:
image: mcr.microsoft.com/dotnet/runtime:8.0 image: mcr.microsoft.com/dotnet/runtime:8.0
command: dotnet /oms/Mocha.Oms.Server.dll command: dotnet /oms/Mocha.Oms.Server.dll
environment: environment:
OMS_SERVERPORT: 3012 OMS_SERVERPORT: 3012 # default is 4436; make sure they match!
OMS_DATABASENAME: mochadb OMS_DATABASENAME: mochadb
OMS_USERNAME: mochadb OMS_USERNAME: mochadb
OMS_PASSWORD: '93X37B]@k(svLmFM' OMS_PASSWORD: '93X37B]@k(svLmFM'
ports: ports:
- "14436:4436" - "13012:3012"
networks: networks:
- app-tenant - app-tenant
volumes: volumes:
- ./mocha-dotnet/mocha-dotnet/src/app/Mocha.Oms.Server/bin/Debug/net8.0:/oms - ./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-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: mochaui-tenant:
build: build:
context: . context: .
@ -29,7 +47,7 @@ services:
# OMS_PASSWORD: '93X37B]@k(svLmFM' # OMS_PASSWORD: '93X37B]@k(svLmFM'
OMS_TYPE: api OMS_TYPE: api
OMS_SERVERNAME: mocha-oms OMS_SERVERNAME: mocha-oms
OMS_SERVERPORT: 4436 OMS_SERVERPORT: 3012 # default is 4436; make sure they match!
THEMES_PATH: /css/themes/{ThemeName}.css THEMES_PATH: /css/themes/{ThemeName}.css
COMMON_THEMES_PATH: /css/common.css COMMON_THEMES_PATH: /css/common.css
# # THEMES_PATH: /themes/{ThemeName}/theme.css # # THEMES_PATH: /themes/{ThemeName}/theme.css
@ -51,18 +69,7 @@ services:
- app-tenant - app-tenant
- app-manager - app-manager
#nginx-proxy-manager: # nginx-proxy-tenant serves the main HTTP(S) site which forwards to the mochaui-tenant
# 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: nginx-proxy-tenant:
depends_on: depends_on:
- static - static

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