Add changes for issue 18171 from official images

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

@@ -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"]

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