From c92d124d2b1f7f73a2e2cb7f8cab9c4d411c8337 Mon Sep 17 00:00:00 2001
From: Frank Viernau <frank_viernau@epam.com>
Date: Thu, 1 Aug 2024 09:19:56 +0200
Subject: [PATCH] chore(docker): Upgrade PHP to the latest active version

Version 8.1 is no more active [1].

[1] https://www.php.net/supported-versions.php

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
---
 Dockerfile                 | 8 +++++---
 docker/versions.dockerfile | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d4b1042dcf2cd..faad8fd0813ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -549,9 +549,11 @@ ARG COMPOSER_VERSION
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    sudo apt-get update && \
-    DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --no-install-recommends \
-    php${PHP_VERSION} \
+    sudo apt-get update \
+    && sudo apt-get install -y software-properties-common \
+    && sudo add-apt-repository ppa:ondrej/php \
+    && sudo apt-get update \
+    && DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --no-install-recommends php${PHP_VERSION} \
     && sudo rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /opt/php/bin \
diff --git a/docker/versions.dockerfile b/docker/versions.dockerfile
index 87002a887ca56..41c7dfba66e27 100644
--- a/docker/versions.dockerfile
+++ b/docker/versions.dockerfile
@@ -15,7 +15,7 @@ ARG LICENSEE_VERSION=9.15.3
 ARG NODEJS_VERSION=20.14.0
 ARG NPM_VERSION=10.7.0
 ARG NUGET_INSPECTOR_VERSION=0.9.12
-ARG PHP_VERSION=8.1
+ARG PHP_VERSION=8.3
 ARG PIPTOOL_VERSION=24.0
 ARG PNPM_VERSION=9.2.0
 ARG PYENV_GIT_TAG=v2.4.1