Merge pull request #806 from Automattic/update/php-fpm

chore(php-fpm): update base image to the latest Ubuntu Noble
Automattic · Oct 31, 2024 · 1b315d0 · 1b315d0
2 parents 96c6d01 + ce5752f
commit 1b315d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/php-fpm/Dockerfile.81 b/php-fpm/Dockerfile.81
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 AS build
+FROM ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30 AS build
 RUN \
     export DEBIAN_FRONTEND=noninteractive && \
     apt-get -q update && \
@@ -17,7 +17,7 @@ RUN \
     cd /mydumper && cmake . && make && make install && rm -rf /mydumper && rm -f mydumper.tar.gz && \
     rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30
 
 # Extra PHP extensions: msgpack (because of memcache)
 # We lack: newrelic
@@ -44,6 +44,7 @@ RUN \
     ln -s /usr/sbin/php-fpm8.1 /usr/sbin/php-fpm
 
 RUN \
+    deluser --remove-home --quiet ubuntu && \
     usermod -d /home/www-data -s /bin/bash www-data && \
     install -d -D -m 0750 -o www-data -g www-data /home/www-data && \
     install -d -D -m 0777 -o www-data -g www-data /var/www/html && \

diff --git a/php-fpm/Dockerfile.82 b/php-fpm/Dockerfile.82
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 AS build
+FROM ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30 AS build
 RUN \
     export DEBIAN_FRONTEND=noninteractive && \
     apt-get -q update && \
@@ -17,7 +17,7 @@ RUN \
     cd /mydumper && cmake . && make && make install && rm -rf /mydumper && rm -f mydumper.tar.gz && \
     rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30
 
 # Extra PHP extensions: msgpack (because of memcache)
 # We lack: newrelic
@@ -44,6 +44,7 @@ RUN \
     ln -s /usr/sbin/php-fpm8.2 /usr/sbin/php-fpm
 
 RUN \
+    deluser --remove-home --quiet ubuntu && \
     usermod -d /home/www-data -s /bin/bash www-data && \
     install -d -D -m 0750 -o www-data -g www-data /home/www-data && \
     install -d -D -m 0777 -o www-data -g www-data /var/www/html && \