From a945e319a8c391e6274fc6909040862944be6c34 Mon Sep 17 00:00:00 2001
From: Orwa Diraneyya <info@orwa.tech>
Date: Thu, 9 Jan 2025 15:55:20 +0100
Subject: [PATCH] Add changes for issue 18171 from official images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This repo is outdated. The current compose files
are only intended for testing/evaluation, and there
is currently no working compose file for testing
the 'fpm' variant of the image.

This likely needs work, which I will be attending
to after my Einbürgerungstest, which is tomorrow.
---
 1/fpm/Dockerfile   |  2 ++
 compose.apache.yml |  9 +++++++++
 compose.fpm.yml    | 18 ------------------
 3 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 compose.fpm.yml

diff --git a/1/fpm/Dockerfile b/1/fpm/Dockerfile
index 3475bfa..6f71a9a 100644
--- a/1/fpm/Dockerfile
+++ b/1/fpm/Dockerfile
@@ -22,5 +22,7 @@ RUN curl -fSL "https://github.com/backdrop/backdrop/archive/refs/tags/${BACKDROP
 # Add custom entrypoint to set BACKDROP_SETTINGS correctly
 COPY docker-entrypoint.sh /entrypoint.sh
 
+EXPOSE 9000
+
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/compose.apache.yml b/compose.apache.yml
index ebf65a1..63b8ad2 100644
--- a/compose.apache.yml
+++ b/compose.apache.yml
@@ -1,3 +1,4 @@
+name: docker-evaluation
 services:
   backdrop:
     build:
@@ -8,6 +9,10 @@ services:
       BACKDROP_DB_HOST: db
       BACKDROP_DB_USER: backdrop
       BACKDROP_DB_PASSWORD: backdrop
+    depends_on:
+      db:
+        condition: service_healthy
+        restart: true
 
   db:
     image: mysql
@@ -16,3 +21,7 @@ services:
       MYSQL_PASSWORD: backdrop
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
       MYSQL_DATABASE: backdrop
+    healthcheck:
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+      timeout: 6s
+      retries: 10
diff --git a/compose.fpm.yml b/compose.fpm.yml
deleted file mode 100644
index 8d30805..0000000
--- a/compose.fpm.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-services:
-  backdrop:
-    build:
-      context: ./1/fpm
-    ports:
-      - 8088:80
-    environment:
-      BACKDROP_DB_HOST: db
-      BACKDROP_DB_USER: backdrop
-      BACKDROP_DB_PASSWORD: backdrop
-
-  db:
-    image: mysql
-    environment:
-      MYSQL_USER: backdrop
-      MYSQL_PASSWORD: backdrop
-      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-      MYSQL_DATABASE: backdrop