mochapowered/mocha-suv
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

finalizing stuff

Browse Source
This commit is contained in:
Michael Becker 2025-01-13 13:27:50 -05:00
parent 75f88b308d
commit 2bbfec832b
5 changed files with 69 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker-build
View File

@ -1,6 +1,14 @@
#!/bin/bash
# update .NET
REBUILD=false
if [ "$1" == "--rebuild" ]; then
REBUILD=true
shift
fi
if [ "$REBUILD" == "true" ]; then
pushd ../mocha-dotnet/mocha-dotnet/src/app/Mocha.Oms.Server
dotnet build
popd
@ -10,10 +18,17 @@ pushd mocha-common/mocha-common
./build
popd
fi
if [ ! -d ./mocha-suv/docker/fs/usr/lib/mocha/oms ]; then
mkdir -p ./mocha-suv/docker/fs/usr/lib/mocha/oms
fi
cp -r ../mocha-dotnet/mocha-dotnet/src/app/Mocha.Oms.Server/bin/Debug/net8.0/* ./mocha-suv/docker/fs/usr/lib/mocha/oms
if [ ! -d ./mocha-suv/docker/fs/usr/share/mocha/system ]; then
mkdir -p ./mocha-suv/docker/fs/usr/share/mocha/system
fi
cp mocha-common/mocha-common/output/net.alcetech.Mocha.System.mcl ./mocha-suv/docker/fs/usr/share/mocha/system
cp mocha-common/mocha-common/output/net.alcetech.Mocha.Web.mcl ./mocha-suv/docker/fs/usr/share/mocha/system

8
docker-run
View File

@ -2,7 +2,7 @@
USE_SSL=false
./docker-build
./docker-build ${1+"$@"}
Q=$?
if [ $Q -ne 0 ]; then
@ -51,16 +51,16 @@ if [ "$PORT_FORWARD" != "" ]; then
if [ "$USE_SSL" == "true" ]; then
docker run --name $SUV_NAME -d -p $PORT_FORWARD:443 mocha-httpd
docker run -h $SUV_NAME$SUV_DOMAINNAME --name $SUV_NAME -d -p $PORT_FORWARD:443 mocha-httpd
else
docker run --name $SUV_NAME -d -p $PORT_FORWARD:80 mocha-httpd
docker run -h $SUV_NAME$SUV_DOMAINNAME --name $SUV_NAME -d -p $PORT_FORWARD:80 mocha-httpd
fi
else
docker run --name $SUV_NAME -d --net mocha-docker -it mocha-httpd # -p 8000:80 mocha-httpd
docker run -h $SUV_NAME$SUV_DOMAINNAME --name $SUV_NAME -d --net mocha-docker -it mocha-httpd # -p 8000:80 mocha-httpd
fi
echo "waiting for network to settle..."

10
mocha-suv/docker/Dockerfile
View File

@ -1,9 +1,6 @@
# FROM httpd
FROM ubuntu
RUN apt update && apt upgrade -y && apt install -y php php-mbstring php-curl php-xml pwgen dotnet-runtime-8.0
# RUN rm /usr/local/apache2/htdocs/index.html
RUN rm /var/www/html/index.html && a2enmod ssl && a2enmod rewrite && service apache2 restart
RUN mkdir /usr/lib/mocha && mkdir /etc/mocha && mkdir /var/mocha
@ -17,8 +14,11 @@ COPY mocha-php/mocha-php/src/mocha-php /var/www/html
COPY mocha-php/phast/lib/phast/server /var/www/html/lib/phast
COPY mocha-php/phast/lib/phast/client/scripts /var/www/html/scripts/phast
COPY mocha-suv/common/certs/localhost.crt /etc/ssl/certs
COPY mocha-suv/common/certs/localhost.key /etc/ssl/certs
COPY mocha-suv/common/certs /etc/ssl/certs
COPY mocha-suv/common/libexec/* /usr/lib/mocha/
COPY mocha-suv/common/libexec/mocha /usr/bin
RUN chmod a+x /usr/bin/mocha /usr/lib/mocha/mocha-*
# COPY mocha-suv/docker/httpd.conf /usr/local/apache2/conf/httpd.conf
# COPY mocha-suv/docker/ports.conf /usr/local/apache2/conf/ports.conf

31
mocha-suv/docker/Dockerfile.php-8.2 Normal file
View File

@ -0,0 +1,31 @@
FROM php:8.2-apache
RUN apt update && apt upgrade -y && apt install -y libcurl pwgen
RUN docker-php-ext-install curl xml
RUN a2enmod ssl && a2enmod rewrite && service apache2 restart
RUN mkdir /usr/lib/mocha && mkdir /etc/mocha && mkdir /var/mocha
# install the root file system overlay
COPY mocha-suv/docker/fs /
COPY mocha-common/mocha-common/data/uploads /var/mocha/uploads
# COPY mocha-php/mocha-php/src/mocha-php /usr/local/apache2/htdocs/
COPY mocha-php/mocha-php/src/mocha-php /var/www/html
COPY mocha-php/phast/lib/phast/server /var/www/html/lib/phast
COPY mocha-php/phast/lib/phast/client/scripts /var/www/html/scripts/phast
COPY mocha-suv/common/certs /etc/ssl/certs
# COPY mocha-suv/docker/httpd.conf /usr/local/apache2/conf/httpd.conf
# COPY mocha-suv/docker/ports.conf /usr/local/apache2/conf/ports.conf
COPY mocha-suv/docker/ports.conf /etc/apache2/ports.conf
# COPY mocha-suv/docker/site.conf /usr/local/apache2/conf/site.conf
COPY mocha-suv/docker/site.conf /etc/apache2/sites-available/000-default.conf
EXPOSE 443
CMD [ "mochactl", "start" ]

5
mocha-suv/docker/fs/usr/sbin/mochactl
View File

@ -11,4 +11,9 @@ case "$1" in
exec $EXECPATH/$EXECFILE &
apache2ctl -D FOREGROUND
;;
"up")
exec $EXECPATH/$EXECFILE &
mocha up
apache2ctl -D FOREGROUND
;;
esac