From e2cd5b170d35f47cfd10638ab26ceb5381324907 Mon Sep 17 00:00:00 2001
From: Bernhard Rusch <brusch@users.noreply.github.com>
Date: Tue, 2 Jul 2024 14:32:06 +0200
Subject: [PATCH] docker-compose.yaml: use PHP 8.3 (#568)

* docker-compose.yaml: use PHP 8.3

* Update README.md

* Update pimcore-demo.yml

* Update pimcore-demo.yml

* removing the extra line, will be testing only 8.3

will be applied on https://github.com/pimcore/demo/pull/578

---------

Co-authored-by: JiaJia Ji <kingjia90@gmail.com>
---
 .github/workflows/pimcore-demo.yml | 10 +++++++---
 README.md                          |  2 +-
 docker-compose.yaml                |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pimcore-demo.yml b/.github/workflows/pimcore-demo.yml
index 4320f5cd..08712e81 100644
--- a/.github/workflows/pimcore-demo.yml
+++ b/.github/workflows/pimcore-demo.yml
@@ -33,14 +33,18 @@ jobs:
         path: 'demo'
 
     - name: Pull latest pimcore image
+      env:
+          PHP_VERSION: "${{ matrix.php-version }}"
       run: |
         # Echo commands and terminate on first error
         set -ex
         
         # Pull latest build of pimcore's image
-        docker pull docker.io/pimcore/pimcore:php8.2-latest
+        docker pull docker.io/pimcore/pimcore:php"${PHP_VERSION}"-latest
 
     - name: Create project from demo in latest pimcore environment
+      env:
+          PHP_VERSION: "${{ matrix.php-version }}"
       run: |
         # Echo commands and terminate on first error
         set -ex
@@ -55,7 +59,7 @@ jobs:
           --volume=${{ github.workspace }}/:/test/ \
           --workdir=/test/ \
           --user=$(id -u):$(id -g) \
-          docker.io/pimcore/pimcore:php8.2-latest \
+          docker.io/pimcore/pimcore:php"${PHP_VERSION}"-latest \
             composer create-project \
               pimcore/demo:@dev \
               --repository='{"type": "path", "url": "./demo"}' \
@@ -145,4 +149,4 @@ jobs:
     - name: Compose down
       run: |
         cd sample-project/
-        docker-compose down -v --remove-orphans
\ No newline at end of file
+        docker-compose down -v --remove-orphans
diff --git a/README.md b/README.md
index 0f056dae..f27c75c3 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ You don't need to have a PHP environment with composer installed.
 ### Follow these steps
 
 1. Initialize the demo project using the `pimcore/pimcore` image
-    ``docker run -u `id -u`:`id -g` --rm -v `pwd`:/var/www/html pimcore/pimcore:php8.2-latest composer create-project pimcore/demo my-project``
+    ``docker run -u `id -u`:`id -g` --rm -v `pwd`:/var/www/html pimcore/pimcore:php8.3-latest composer create-project pimcore/demo my-project``
 1. Go to your new project
     `cd my-project/`
 1. Part of the new project is a docker compose file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 00e441fb..46f306b4 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -29,7 +29,7 @@ services:
 
     php:
         #user: '1000:1000' # set to your uid:gid
-        image: pimcore/pimcore:php8.2-debug-latest
+        image: pimcore/pimcore:php8.3-debug-latest
         environment:
             COMPOSER_HOME: /var/www/html
             PHP_IDE_CONFIG: serverName=localhost
@@ -41,7 +41,7 @@ services:
 
     supervisord:
         #user: '1000:1000' # set to your uid:gid
-        image: pimcore/pimcore:php8.2-supervisord-latest
+        image: pimcore/pimcore:php8.3-supervisord-latest
         depends_on:
             - db
         volumes: