Got a much simpler solution working for dat.test.

This commit is contained in:
2025-07-03 10:30:46 +10:00
parent 21862771c1
commit 7237db7d52
6 changed files with 22 additions and 4 deletions

View File

@@ -0,0 +1 @@
20250610: agenda

View File

@@ -0,0 +1 @@
20250619: agenda

View File

@@ -0,0 +1 @@
20250610: minutes

View File

@@ -0,0 +1 @@
20250619: minutes

View File

@@ -1,3 +1,17 @@
#
# By default the dat.live folder will be mounted.
# For testing you might like to switch to dat.test
# The HLBDAT environment variable will do this for you.
# If that variable is unset, dat.live will be used.
# To use dat.test instead, run this...
#
# $ HLBDAT=dat.test docker compose up
#
# ...but if you're happy to play with the live data
# this will do...
#
# $ docker compose up
#
services:
app:
image: php:8.2-apache
@@ -7,7 +21,7 @@ services:
volumes:
- ./app/:/var/www/html:Z
- ./lib:/var/www/html/lib:Z
- ./dat.live:/var/www/html/dat:Z
- ./${HLBDAT:-dat.live}:/var/www/html/dat:Z
networks:
- labnet
adm:
@@ -18,7 +32,7 @@ services:
volumes:
- ./adm/:/var/www/html:Z
- ./lib:/var/www/html/lib:Z
- ./dat.live:/var/www/html/dat:Z
- ./${HLBDAT:-dat.live}:/var/www/html/dat:Z
networks:
- labnet
networks:

View File

@@ -11,8 +11,8 @@ function getEvents() {
$ctl = $dt -> format("YmdHi");
$entries[$i]["ctl"] = $ctl;
$datestamp = $dt -> format("Ymd");
$files = array( "agenda" => sprintf("agenda/%d.md", $datestamp)
, "minutes" => sprintf("minutes/%d.md", $datestamp)
$files = array( "agenda" => sprintf("dat/agenda/%d.md", $datestamp)
, "minutes" => sprintf("dat/minutes/%d.md", $datestamp)
);
foreach ( $files as $key => $file ) {
if ( file_exists( $file ) ) {