From 34db79b3ab34eda4ab3a52d5eb3e6c480d11f26b Mon Sep 17 00:00:00 2001
From: Jeroen De Meerleer <me@jeroened.be>
Date: Thu, 7 Dec 2023 14:43:01 +0100
Subject: [PATCH] Update Dockerfile versions and dependencies

- Update the base image for nodebuilder from node:18 to node:20
- Update the base image for php in Dockerfile and Dockerfile.daemon from php:8.1 to php:8.3
- Remove unnecessary packages installation in Dockerfile, Dockerfile.daemon, and Dockerfile.webui
- Set APACHE_DOCUMENT_ROOT, WEBCRON_ROOT, and TZ environment variables in all three Dockerfiles
---
 Dockerfile        | 4 ++--
 Dockerfile.daemon | 2 +-
 Dockerfile.webui  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f4a6f68..fb0b18b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18 as nodebuilder
+FROM node:20 as nodebuilder
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y && apt-get install -y git
 
@@ -8,7 +8,7 @@ RUN npm install
 RUN npm run build
 RUN rm -rf node_modules
 
-FROM php:8.1-apache
+FROM php:8.3-apache
 ENV APACHE_DOCUMENT_ROOT=/var/www/webcron/public/
 ENV WEBCRON_ROOT=/var/www/webcron/
 ENV TZ=Europe/Brussels
diff --git a/Dockerfile.daemon b/Dockerfile.daemon
index f3b0bfc..11a7a87 100644
--- a/Dockerfile.daemon
+++ b/Dockerfile.daemon
@@ -1,4 +1,4 @@
-FROM php:8.1
+FROM php:8.3
 RUN apt-get update -y && apt-get install -y git
 ENV APACHE_DOCUMENT_ROOT=/var/www/webcron/public/
 ENV WEBCRON_ROOT=/var/www/webcron/
diff --git a/Dockerfile.webui b/Dockerfile.webui
index 4f88139..aa68733 100644
--- a/Dockerfile.webui
+++ b/Dockerfile.webui
@@ -1,4 +1,4 @@
-FROM node:18 as nodebuilder
+FROM node:20 as nodebuilder
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y && apt-get install -y git
 
@@ -8,7 +8,7 @@ RUN npm install
 RUN npm run build
 RUN rm -rf node_modules
 
-FROM php:8.1-apache
+FROM php:8.3-apache
 ENV APACHE_DOCUMENT_ROOT=/var/www/webcron/public/
 ENV WEBCRON_ROOT=/var/www/webcron/
 ENV TZ=Europe/Brussels