From 45a8d02759551377a4d62cdcaed32eafe857176a Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Thu, 3 Oct 2024 15:34:16 +0200
Subject: [PATCH] docker: update to php 8.3
---
docker/.env | 2 +-
docker/containers/web-server/Dockerfile | 4 ++--
.../containers/web-server/apache/sites-enabled/vhost_app.conf | 2 +-
docker/containers/web-server/php/extra-php-config.ini | 2 +-
docker/docker-compose.yml | 4 ++--
docker/init.sh.cfg | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docker/.env b/docker/.env
index 31d8948..ecf8727 100644
--- a/docker/.env
+++ b/docker/.env
@@ -1,6 +1,6 @@
# ======================================================================
#
-# GENERATED BY init.sh - template: ./templates/dot_env - e2cde05722688ff85d3a93e9cd55787e
+# GENERATED BY init.sh - template: templates/dot_env - e2cde05722688ff85d3a93e9cd55787e
# values to be used in docker-composer.yml
#
# ======================================================================
diff --git a/docker/containers/web-server/Dockerfile b/docker/containers/web-server/Dockerfile
index 3126388..75b0974 100644
--- a/docker/containers/web-server/Dockerfile
+++ b/docker/containers/web-server/Dockerfile
@@ -1,7 +1,7 @@
#
-# GENERATED BY init.sh - template: ./templates/web-server-Dockerfile - 42dce773c83597a7d05af398bdd66d15
+# GENERATED BY init.sh - template: templates/web-server-Dockerfile - 42dce773c83597a7d05af398bdd66d15
#
-FROM php:8.2-apache
+FROM php:8.3-apache
# install packages
RUN apt-get update && apt-get install -y git unzip zip
diff --git a/docker/containers/web-server/apache/sites-enabled/vhost_app.conf b/docker/containers/web-server/apache/sites-enabled/vhost_app.conf
index 7ed4d6f..77c2858 100644
--- a/docker/containers/web-server/apache/sites-enabled/vhost_app.conf
+++ b/docker/containers/web-server/apache/sites-enabled/vhost_app.conf
@@ -1,5 +1,5 @@
#
-# GENERATED BY init.sh - template: ./templates/vhost_app.conf - 50f337db404bc73530e3340a8f2f1af9
+# GENERATED BY init.sh - template: templates/vhost_app.conf - 50f337db404bc73530e3340a8f2f1af9
#
<VirtualHost *:80>
DocumentRoot /var/www/my_new_app/public_html
diff --git a/docker/containers/web-server/php/extra-php-config.ini b/docker/containers/web-server/php/extra-php-config.ini
index aa13bd7..8fc5696 100644
--- a/docker/containers/web-server/php/extra-php-config.ini
+++ b/docker/containers/web-server/php/extra-php-config.ini
@@ -1,5 +1,5 @@
;
-; GENERATED BY init.sh - template: ./templates/extra-php-config.ini - 9dce36d285d5b21d70e015c074c196c2
+; GENERATED BY init.sh - template: templates/extra-php-config.ini - 9dce36d285d5b21d70e015c074c196c2
;
[PHP]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9b5d994..4fa133f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,5 +1,5 @@
#
-# GENERATED BY init.sh - template: ./templates/docker-compose.yml - fc2f1d55926abdb9c54f65afd0571d7b
+# GENERATED BY init.sh - template: templates/docker-compose.yml - fc2f1d55926abdb9c54f65afd0571d7b
#
# ======================================================================
#
@@ -19,7 +19,7 @@ services:
build:
context: .
dockerfile: ./containers/web-server/Dockerfile
- image: "php:8.2-apache"
+ image: "php:8.3-apache"
container_name: 'my_new_app-server'
ports:
- '${APP_PORT}:80'
diff --git a/docker/init.sh.cfg b/docker/init.sh.cfg
index 7c781c5..e30c69e 100644
--- a/docker/init.sh.cfg
+++ b/docker/init.sh.cfg
@@ -17,7 +17,7 @@ APP_APT_PACKAGES="git unzip zip"
#APP_APACHE_MODULES="rewrite"
APP_APACHE_MODULES=""
-APP_PHP_VERSION=8.2
+APP_PHP_VERSION=8.3
# APP_PHP_MODULES="curl pdo_mysql mbstring xml zip xdebug"
# APP_PHP_MODULES="curl mbstring xml zip xdebug"
APP_PHP_MODULES="xdebug"
--
GitLab