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

Automatic update
City-of-Helsinki · Aug 3, 2023 · 2a2a183 · 2a2a183
2 parents ef9a9fb + 1dece6d
commit 2a2a183
Show file tree

Hide file tree

Showing 9 changed files with 137 additions and 293 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/block.block.brandingnavigation.yml b/conf/cmi/block.block.brandingnavigation.yml
diff --git a/conf/cmi/block.block.hdbt_subtheme_brandingnavigation.yml b/conf/cmi/block.block.hdbt_subtheme_brandingnavigation.yml
diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml
@@ -42,8 +42,8 @@ content:
  weight: 4
  region: content
  settings:
- linkit_auto_link_text: false
  linkit_profile: helfi
+ linkit_auto_link_text: false
  third_party_settings: { }
  field_banner_link_design:
  type: design_field_widget

diff --git a/conf/cmi/system.menu.branding-navigation.yml b/conf/cmi/system.menu.branding-navigation.yml
diff --git a/docker/openshift/crons/migrate-hearings.sh b/docker/openshift/crons/migrate-hearings.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "Starting hearings migration: $(date)"
+
+while true
+do
+ drush mim helfi_hearings --reset-threshold 43200 --interval 1800
+ sleep 900
+done
diff --git a/tools/make/drupal.mk b/tools/make/drupal.mk
@@ -40,7 +40,8 @@ endif
 
 PHONY += drupal-create-folders
 drupal-create-folders:
- @mkdir -p $(DRUPAL_CREATE_FOLDERS)
+ $(call step,Create folders for Drupal...\n)
+ $(call docker_compose_exec,mkdir -v -p $(DRUPAL_CREATE_FOLDERS))
 
 PHONY += drupal-update
 drupal-update: ## Update Drupal core with Composer
@@ -162,24 +163,19 @@ drush-download-dump: ## Download database dump to dump.sql
  $(call drush,@$(DRUPAL_SYNC_SOURCE) sql-dump --structure-tables-key=common > ${DOCKER_PROJECT_ROOT}/$(DUMP_SQL_FILENAME))
 
 PHONY += open-db-gui
-open-db-gui: DB_CONTAINER := $(COMPOSE_PROJECT_NAME)-db
-open-db-gui: DB_NAME := drupal
-open-db-gui: DB_USER := drupal
-open-db-gui: DB_PASS := drupal
-open-db-gui: --open-db-gui ## Open database with GUI tool
+open-db-gui: ## Open database with GUI tool
+ $(eval DB_SERVICE ?= db)
+ $(eval DB_NAME ?= drupal)
+ $(eval DB_USER ?= drupal)
+ $(eval DB_PASS ?= drupal)
+ @open mysql://$(DB_USER):$(DB_PASS)@$(shell docker compose port $(DB_SERVICE) 3306 | grep -v ::)/$(DB_NAME)
 
 PHONY += fix-drupal
 fix-drupal: PATHS := $(subst $(space),,$(LINT_PATHS_PHP))
 fix-drupal: ## Fix Drupal code style
  $(call step,Fix Drupal code style with phpcbf...\n)
  $(call cs,phpcbf,$(PATHS))
 
-PHONY += fix-drupal-coder
-fix-drupal-coder: VERSION := 8.3.16
-fix-drupal-coder: ## Fix Drupal Coder loading
- composer config repositories.drupal '{"type": "composer", "url": "https://packages.drupal.org/8"}'
- composer config repositories.drupal/coder '{"type": "package", "package": {"name": "drupal/coder", "type": "phpcodesniffer-standard", "version": "$(VERSION)", "dist": {"type": "zip", "url": "https://ftp.drupal.org/files/projects/coder-$(VERSION).zip"}}}'
-
 PHONY += lint-drupal
 lint-drupal: PATHS := $(subst $(space),,$(LINT_PATHS_PHP))
 lint-drupal: ## Lint Drupal code style

diff --git a/tools/make/lagoon.mk b/tools/make/lagoon.mk
@@ -1,5 +1,6 @@
 CLI_SERVICE := cli
 CLI_SHELL := bash
+DB_SERVICE := mariadb
 
 INSTANCE_prod_USER ?= project-name-branch
 INSTANCE_prod_HOST ?= ssh.lagoon.amazeeio.cloud

diff --git a/tools/make/utils.mk b/tools/make/utils.mk
@@ -19,10 +19,6 @@ else
  @lt --port 443 --subdomain $(COMPOSE_PROJECT_NAME) --local-https --allow-invalid-cert
 endif
 
-PHONY += --open-db-gui
---open-db-gui:
- @open mysql://$(DB_USER):$(DB_PASS)@$(shell docker port $(DB_CONTAINER) 3306 | grep -v ::)/$(DB_NAME)
-
 define dbg
  @printf "${GREEN}${1}:${NO_COLOR} ${2}\n"
 endef