Attempting a simpler configuration. Podman doesn't like it. Moving to Docker for sanity check.

This commit is contained in:
2025-07-03 09:56:47 +10:00
parent 4ce23cc392
commit 5c77dbc2a3
179 changed files with 10 additions and 16 deletions

View File

@@ -1,6 +1,6 @@
<?php <?php
header("Content-Type: application/json"); header("Content-Type: application/json");
include('lib.php'); include('lib/main.php');
$ret = array( "err" => "unknown command" ); $ret = array( "err" => "unknown command" );
if ( in_array("cmd", array_keys($_GET)) and $_GET["cmd"] == "get" ) { if ( in_array("cmd", array_keys($_GET)) and $_GET["cmd"] == "get" ) {
$ret = getEvents(); $ret = getEvents();

0
web/lib.php → adm/lib.php Normal file → Executable file
View File

View File

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

View File

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 78 KiB

View File

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 87 KiB

View File

@@ -1,8 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<?php <?php
require 'lib.php'; require 'lib/main.php';
require 'vendor/autoload.php'; require 'lib/vendor/autoload.php';
use Michelf\Markdown; use Michelf\Markdown;
?> ?>

0
app/lib.php Normal file
View File

View File

@@ -5,28 +5,22 @@ services:
ports: ports:
- "8080:80" - "8080:80"
volumes: volumes:
- ./web/:/var/www/html:Z - ./app/:/var/www/html:Z
- ./vendor/:/var/www/html/vendor:Z - ./lib:/var/www/html/lib:Z
- ./lib.php:/var/www/html/lib.php:Z
- ./dat.live:/var/www/html/dat:Z - ./dat.live:/var/www/html/dat:Z
networks: networks:
- labnet - labnet
profiles: adm:
- app
cal:
image: php:8.2-apache image: php:8.2-apache
container_name: cal container_name: adm
ports: ports:
- "8080:80" - "8081:80"
volumes: volumes:
- ./cal/:/var/www/html:Z - ./adm/:/var/www/html:Z
- ./vendor/:/var/www/html/vendor:Z - ./lib:/var/www/html/lib:Z
- ./lib.php:/var/www/html/lib.php:Z
- ./dat.live:/var/www/html/dat:Z - ./dat.live:/var/www/html/dat:Z
networks: networks:
- labnet - labnet
profiles:
- cal
networks: networks:
labnet: labnet:
external: true external: true

View File

Some files were not shown because too many files have changed in this diff Show More