From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 7 Dec 2023 19:12:01 +0000 (+0100)
Subject: wip #6433 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9eba51e0308f700c365bc2c04d5bd48d18e31781;p=fluidbook-toolbox.git

wip #6433 @1
---

diff --git a/.docker/alpha/docker-compose.yml b/.docker/alpha/docker-compose.yml
index f657369fe..33463fd69 100644
--- a/.docker/alpha/docker-compose.yml
+++ b/.docker/alpha/docker-compose.yml
@@ -61,8 +61,8 @@ services:
       # Rclone
       - '/data/toolbox/alpha/.docker/config/rclone.conf:/application/.config/rclone/rclone.conf'
       # PHP
-      - '/data/toolbox/alpha/.docker/config/php/php.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini'
-      - '/data/toolbox/alpha/.docker/config/php/fpm.conf:/etc/php/8.2/fpm/pool.d/z-overrides.conf'
+      - '/data/toolbox/alpha/.docker/config/php/php.ini:/etc/php/8.3/fpm/conf.d/99-overrides.ini'
+      - '/data/toolbox/alpha/.docker/config/php/fpm.conf:/etc/php/8.3/fpm/pool.d/z-overrides.conf'
       # ENV
       - '/data/toolbox/alpha/.env.alpha:/application/.env'
     ports:
diff --git a/.docker/images/php-alpha/Dockerfile b/.docker/images/php-alpha/Dockerfile
index 3d4bcaa0a..b5a7a0221 100644
--- a/.docker/images/php-alpha/Dockerfile
+++ b/.docker/images/php-alpha/Dockerfile
@@ -13,7 +13,7 @@ RUN apt update && apt -y --no-install-recommends install build-essential scons m
 RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.08.1/nsis-code-7336-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7336-1-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu"
 
 # Add additional repositories
-RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash -
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
 RUN sh -c 'echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list'
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
 RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
@@ -21,31 +21,30 @@ RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/
 
 RUN apt update && apt -y --no-install-recommends install \
         git git-restore-mtime \
-        php8.2-fpm \
-        php8.2-apcu \
-        php8.2-cli \
-        php8.2-curl \
-        php8.2-mbstring \
-        php8.2-opcache \
-        php8.2-readline \
-        php8.2-xml \
-        php8.2-zip \
-        php8.2-bz2 \
-        php8.2-gd \
-        php8.2-igbinary \
-        php8.2-imap \
-        php8.2-imagick \
-        php8.2-intl \
-        php8.2-memcached \
-        php8.2-mysql \
-        php8.2-redis \
-        php8.2-soap \
-        php8.2-ssh2 \
-        php8.2-tidy \
-        php8.2-xsl \
-        php8.2-curl \
-        php8.2-mcrypt \
-        php8.2-bcmath \
+        php8.3-fpm \
+        php8.3-apcu \
+        php8.3-cli \
+        php8.3-curl \
+        php8.3-mbstring \
+        php8.3-opcache \
+        php8.3-readline \
+        php8.3-xml \
+        php8.3-zip \
+        php8.3-bz2 \
+        php8.3-gd \
+        php8.3-igbinary \
+        php8.3-imap \
+        php8.3-imagick \
+        php8.3-intl \
+        php8.3-memcached \
+        php8.3-mysql \
+        php8.3-redis \
+        php8.3-soap \
+        php8.3-ssh2 \
+        php8.3-tidy \
+        php8.3-xsl \
+        php8.3-curl \
+        php8.3-bcmath \
         less nano wget bash lynx
 
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
diff --git a/bin/startup.sh b/bin/startup.sh
index c2f062f07..4dcc2a6d2 100644
--- a/bin/startup.sh
+++ b/bin/startup.sh
@@ -70,5 +70,5 @@ else
 fi
 
 # Launch PHP
-/usr/sbin/php-fpm8.2 -O
+/usr/sbin/php-fpm8.3 -O