Update Docker Compose test setups

README.md

@@ -66,7 +66,7 @@ Added features:
 
 Needs:
 
-- Nginx (`druidfi/nginx:1.25-drupal`)
+- Nginx (`druidfi/nginx:1.27-drupal`)
 - Database (`druidfi/mariadb:10.11-drupal-lts`)
 
 ENV variables:
@@ -108,17 +108,17 @@ Needs:
 
 ### Base variant
 
-- `1.24` stable based on `nginx:1.24-alpine`
-- `1.25` mainline based on `nginx:1.25-alpine`
+- `1.26` stable based on `nginx:1.26-alpine`
+- `1.27` mainline based on `nginx:1.27-alpine`
 
 Added features:
 
 - Default Nginx configuration
 
 ### Drupal variant
 
-- `1.24-drupal` based on `druidfi/nginx:1.24`
-- `1.25-drupal` based on `druidfi/nginx:1.25`
+- `1.26-drupal` based on `druidfi/nginx:1.26`
+- `1.27-drupal` based on `druidfi/nginx:1.27`
 
 Added features:
 

examples/drupal-separate-services/docker-compose.yml → examples/drupal-separate-services/compose.yaml

@@ -1,18 +1,18 @@
 services:
 
   nginx:
-    hostname: ${DRUPAL_HOSTNAME}
     container_name: ${COMPOSE_PROJECT_NAME}-nginx
-    image: druidfi/nginx:1.25-drupal
+    hostname: ${COMPOSE_PROJECT_NAME}
+    image: druidfi/nginx:1.27-drupal
     volumes:
       - .:/app:delegated
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.entrypoints=https"
-      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.rule=Host(`${DRUPAL_HOSTNAME}`)"
-      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.tls=true"
-      - "traefik.http.services.${COMPOSE_PROJECT_NAME}-nginx.loadbalancer.server.port=8080"
-      - "traefik.docker.network=stonehenge-network"
+      - traefik.enable=true
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.entrypoints=https
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.rule=Host(`${DRUPAL_HOSTNAME}`)
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.tls=true
+      - traefik.http.services.${COMPOSE_PROJECT_NAME}-nginx.loadbalancer.server.port=8080
+      - traefik.docker.network=stonehenge-network
     networks:
       - default
       - stonehenge-network
@@ -21,7 +21,7 @@ services:
 
   app:
     container_name: ${COMPOSE_PROJECT_NAME}-app
-    image: druidfi/drupal:php-8.2
+    image: druidfi/drupal:php-8.3
     volumes:
       - .:/app:delegated
     environment:

tests/drupal-and-nginx/docker-compose.yml → tests/drupal-and-nginx/compose.yaml

@@ -1,18 +1,18 @@
 services:
 
   nginx:
-    hostname: ${DRUPAL_HOSTNAME}
     container_name: ${COMPOSE_PROJECT_NAME}-nginx
-    image: druidfi/nginx:1.25-drupal
+    hostname: ${COMPOSE_PROJECT_NAME}
+    image: druidfi/nginx:1.27-drupal
     volumes:
       - .:/app:delegated
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.entrypoints=https"
-      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.rule=Host(`${DRUPAL_HOSTNAME}`)"
-      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.tls=true"
-      - "traefik.http.services.${COMPOSE_PROJECT_NAME}-nginx.loadbalancer.server.port=8080"
-      - "traefik.docker.network=stonehenge-network"
+      - traefik.enable=true
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.entrypoints=https
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.rule=Host(`${DRUPAL_HOSTNAME}`)
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-nginx.tls=true
+      - traefik.http.services.${COMPOSE_PROJECT_NAME}-nginx.loadbalancer.server.port=8080
+      - traefik.docker.network=stonehenge-network
     networks:
       - default
       - stonehenge-network
@@ -21,7 +21,7 @@ services:
 
   app:
     container_name: ${COMPOSE_PROJECT_NAME}-app
-    image: druidfi/drupal:php-8.2
+    image: druidfi/drupal:php-8.3
     volumes:
       - .:/app:delegated
     environment:

tests/drupal-test/.env

@@ -1,3 +1,3 @@
 COMPOSE_PROJECT_NAME=test-drupal
 DRUPAL_HOSTNAME=test-drupal.docker.so
-DRUPAL_IMAGE=druidfi/drupal-test:php-8.2
+DRUPAL_IMAGE=druidfi/drupal-test:php-8.3

tests/drupal-test/compose.yaml

@@ -0,0 +1,28 @@
+services:
+
+  app:
+    container_name: ${COMPOSE_PROJECT_NAME}-app
+    hostname: ${COMPOSE_PROJECT_NAME}
+    image: ${DRUPAL_IMAGE}
+    environment:
+      DRUSH_OPTIONS_URI: https://${DRUPAL_HOSTNAME}
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-app.entrypoints=https
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-app.rule=Host(`${DRUPAL_HOSTNAME}`)
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-app.tls=true
+      - traefik.http.services.${COMPOSE_PROJECT_NAME}-app.loadbalancer.server.port=8080
+      - traefik.docker.network=stonehenge-network
+    networks:
+      - default
+      - stonehenge-network
+    depends_on:
+      - db
+
+  db:
+    container_name: ${COMPOSE_PROJECT_NAME}-db
+    image: druidfi/mariadb:10.11-drupal-lts
+
+networks:
+  stonehenge-network:
+    external: true

tests/wp-test/compose.yaml

@@ -0,0 +1,34 @@
+services:
+
+  app:
+    container_name: ${COMPOSE_PROJECT_NAME}-app
+    hostname: ${COMPOSE_PROJECT_NAME}
+    image: ${WP_IMAGE}
+    environment:
+      WP_SITEURL: https://${WP_HOSTNAME}
+      DB_HOST: db
+      DB_NAME: drupal
+      DB_USER: drupal
+      DB_PASSWORD: drupal
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-app.entrypoints=https
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-app.rule=Host(`${WP_HOSTNAME}`)
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME}-app.tls=true
+      - traefik.http.services.${COMPOSE_PROJECT_NAME}-app.loadbalancer.server.port=8080
+      - traefik.docker.network=stonehenge-network
+    networks:
+      - default
+      - stonehenge-network
+    depends_on:
+      - db
+
+  db:
+    container_name: ${COMPOSE_PROJECT_NAME}-db
+    image: druidfi/mysql:5.7-drupal
+    ports:
+      - 3306
+
+networks:
+  stonehenge-network:
+    external: true