Merge pull request #830 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Mar 20, 2024 · 94c3c8c · 94c3c8c
2 parents 7fc2261 + 1d14602
commit 94c3c8c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -1 +1 @@
-5
+6
diff --git a/docker-compose.yml → compose.yaml b/docker-compose.yml → compose.yaml
@@ -27,7 +27,6 @@ services:
       # Use drush server to run functional tests, so we don't have to care about
       # permission or SSL issues.
       SIMPLETEST_BASE_URL: "http://app:8888"
-      SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
       BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}"
       BROWSERTEST_OUTPUT_DIRECTORY: "/app/public/sites/default/files/simpletest"
       DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish"

diff --git a/composer.lock b/composer.lock
diff --git a/tools/make/docker.mk b/tools/make/docker.mk
@@ -1,7 +1,7 @@
 CLI_SERVICE := app
 CLI_SHELL := sh
 # Note: specification says this file would be compose.yaml
-DOCKER_COMPOSE_YML_PATH ?= docker-compose.yml
+DOCKER_COMPOSE_YML_PATH ?= compose.yaml
 DOCKER_COMPOSE_YML_EXISTS := $(shell test -f $(DOCKER_COMPOSE_YML_PATH) && echo yes || echo no)
 DOCKER_PROJECT_ROOT ?= /app
 DOCKER_WARNING_INSIDE := You are inside the Docker container!