From cbf97d6a847968bd2f50a38d54d7c5fdb8ba0106 Mon Sep 17 00:00:00 2001
From: Krzysztof Imbierowicz <87810379+marcellobonini@users.noreply.github.com>
Date: Wed, 8 Apr 2026 19:10:43 +0200
Subject: [PATCH 1/2] Fix failing build on obsolite debian packages

---
 Dockerfile         | 14 ++++++++++++++
 docker-compose.yml |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0aaf65f..257728f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,25 @@ FROM php:5.6-apache
 # Install the mysqli extension
 RUN docker-php-ext-install mysqli
 
+<<<<<<< HEAD
 # Update repo
 RUN apt-get update -y
 
 # Install mysql-client
 RUN apt-get install mysql-client -y
+=======
+# Update package sources for the archived Debian Stretch base image and
+# install the CLI tools needed during the image build.
+RUN set -eux; \
+  printf '%s\n' \
+    'deb [trusted=yes] http://archive.debian.org/debian stretch main' \
+    'deb [trusted=yes] http://archive.debian.org/debian-security stretch/updates main' \
+    > /etc/apt/sources.list; \
+  printf 'Acquire::Check-Valid-Until "false";\n' > /etc/apt/apt.conf.d/99archive; \
+  apt-get update -o Acquire::Check-Valid-Until=false; \
+  apt-get install -y --no-install-recommends curl default-mysql-client; \
+  rm -rf /var/lib/apt/lists/*
+>>>>>>> 00ae996 (Fix failing build on obsolite debian packages)
 
 # Install wp-cli as wp
 RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar  && \
diff --git a/docker-compose.yml b/docker-compose.yml
index 394a9ee..2865636 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
-version: '3.1'
-
 services:
 
     db:
+        # MySQL 5.7 is pulled as amd64 on Apple Silicon, so make that explicit.
+        platform: linux/amd64
         # mysql/mysql-server is less in size than mysql
         image: mysql/mysql-server:5.7
         restart: always

From 83900264323c72cab87d5f2285d3bad6400d58a8 Mon Sep 17 00:00:00 2001
From: Krzysztof Imbierowicz <87810379+marcellobonini@users.noreply.github.com>
Date: Wed, 8 Apr 2026 19:38:49 +0200
Subject: [PATCH 2/2] merge main on dockerfile

---
 Dockerfile | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 257728f..72e804c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,13 +4,6 @@ FROM php:5.6-apache
 # Install the mysqli extension
 RUN docker-php-ext-install mysqli
 
-<<<<<<< HEAD
-# Update repo
-RUN apt-get update -y
-
-# Install mysql-client
-RUN apt-get install mysql-client -y
-=======
 # Update package sources for the archived Debian Stretch base image and
 # install the CLI tools needed during the image build.
 RUN set -eux; \
@@ -22,7 +15,6 @@ RUN set -eux; \
   apt-get update -o Acquire::Check-Valid-Until=false; \
   apt-get install -y --no-install-recommends curl default-mysql-client; \
   rm -rf /var/lib/apt/lists/*
->>>>>>> 00ae996 (Fix failing build on obsolite debian packages)
 
 # Install wp-cli as wp
 RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar  && \