Merge branch 'craigk5n:master' into lintall

.github/workflows/php-syntax-check.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Check PHP syntax
         run: |

docker/Dockerfile-php8

@@ -1,11 +1,9 @@
-#escape=`
-# To run on Windows, where \ is the path separator.
-
-FROM php:8.0-apache
-# MAINTAINER deprecated in favor of LABEL.
-LABEL craigk5n <craig@k5n.us>
-LABEL vendor "k5n.us"
+# Use the official PHP image with Apache
+FROM php:8-apache
+LABEL maintainer="craig@k5n.us"
+LABEL vendor="k5n.us"
 
+# Install mysqli extension
 RUN docker-php-ext-install mysqli
 
 # Copy all files except those in .dockerignore
@@ -15,3 +13,9 @@ COPY . /var/www/html/
 # to allow the web-based installer to update it.
 RUN touch /var/www/html/includes/settings.php
 RUN chmod 777 /var/www/html/includes/settings.php
+
+# Set working directory
+WORKDIR /var/www/html
+
+# Start Apache server in the foreground
+CMD ["apache2-foreground"]

docker/Dockerfile-php8-dev

@@ -1,12 +1,21 @@
-FROM php:8.0-apache
-LABEL org.opencontainers.image.authors="craig@k5n.us"
+# Use the official PHP image with Apache
+FROM php:8-apache
+LABEL maintainer="craig@k5n.us"
+LABEL vendor="k5n.us"
+
+# Install mysqli extension
 RUN docker-php-ext-install mysqli
 
-#COPY docker/cron-hourly /tmp/cron.hourly
-#RUN crontab /tmp/cron.hourly
+# Install GD extension and its dependencies
+RUN apt-get update && apt-get install -y \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libpng-dev \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install -j$(nproc) gd
 
-# Run the cron every hour
-#RUN echo '0 * * * * php /var/www/html/tools/send_reminders.php' > /etc/crontabs/root
-#TODO: setup cron
+# Set working directory
+WORKDIR /var/www/html
 
-#RUN chown -R www-data:www-data /var/www
+# Start Apache server in the foreground
+CMD ["apache2-foreground"]

docker/docker-compose-php8-dev.yml

@@ -1,9 +1,10 @@
+# Run docker-compose from the top-level WebCalendar directory and not from this "docker" subdirectory.
 # The first time you run this, you will need to grant permission
 # for the webcalendar user to access mariadb (after you have run
 # docker-compose up).  You only need to do this once.
 #
 #   Start a shell on the mariadb container:
-#     docker-compose -f docker-compose-php8.yml exec db /bin/sh
+#     docker-compose -f docker/docker-compose-php8-dev.yml exec db /bin/sh
 #   Start the mariadb client:
 #     /bin/mariadb -p
 #     (enter the MYSQL_ROOT_PASSWORD below)
@@ -14,7 +15,7 @@
 #
 #   If you need shell access on the webserver container running WebCalendar, you can use
 #   the following command:
-#     docker-compose -f docker-compose-php8.yml exec webcalendar-php8 /bin/sh
+#     docker-compose -f docker/docker-compose-php8-dev.yml exec webcalendar-php8 /bin/sh
 
 version: '3.1'
 
@@ -42,7 +43,7 @@ services:
     ports:
       - 8080:80
     volumes:
-      - .:/var/www/html/
+      - ..:/var/www/html/
 
 volumes:
   mysql-data:

docker/docker-compose-php8.yml

@@ -1,9 +1,10 @@
+# Run docker-compose from the top-level WebCalendar directory and not from this "docker" subdirectory.
 # The first time you run this, you will need to grant permission
 # for the webcalendar user to access mariadb (after you have run
 # docker-compose up).  You only need to do this once.
 #
 #   Start a shell on the mariadb container:
-#     docker-compose -f docker-compose-php8.yml exec db /bin/sh
+#     docker-compose -f docker/docker-compose-php8.yml exec db /bin/sh
 #   Start the mariadb client:
 #     /bin/mariadb -p
 #     (enter the MYSQL_ROOT_PASSWORD below)
@@ -14,7 +15,7 @@
 #
 #   If you need shell access on the webserver container running WebCalendar, you can use
 #   the following command:
-#     docker-compose -f docker-compose-php8.yml exec webcalendar-php8 /bin/sh
+#     docker-compose -f docker/docker-compose-php8.yml exec webcalendar-php8 /bin/sh
 
 version: '3.1'