Merge pull request #292 from City-of-Helsinki/UHF-9626_infra

UHF-9626 infra

.github/pull_request_template.md

@@ -19,11 +19,16 @@
 * [ ] Check that this feature works
 * [ ] Check that code follows our standards
 
-## Designers review
+## Continuous documentation
 <!-- One of the checkboxes below needs to be checked like this: `[x]` (or click when not in edit mode) -->
 
-* [ ] This PR does not need designers review
-* [ ] This PR has been visually reviewed by a designer (Name of the designer)
+* [ ] This feature has been documented/the documentation has been updated
+* [ ] This change doesn't require updates to the documentation
+
+## Translations
+<!-- The checkbox below needs to be checked like this: `[x]` (or click when not in edit mode). Not needed if the translations were not affected. -->
+
+* [ ] Translations have been added to .po -files and included in this PR
 
 ## Other PRs
 <!-- For example an related PR in another repository -->

.github/workflows/artifact.yml.dist → .github/workflows/artifact.yml

@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
+      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
 
     services:
       db:

.github/workflows/auto-release-pr.yml.dist

@@ -7,9 +7,7 @@ jobs:
   release-pr:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
+      - uses: actions/checkout@v4
       - name: Create pull request
         run: |
           gh pr create \

.github/workflows/test.yml.dist

@@ -10,7 +10,7 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine
+      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
       options: --hostname app
 
     services:
@@ -23,7 +23,6 @@ jobs:
           MYSQL_ROOT_PASSWORD: drupal
         ports:
           - 3306:3306
-
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/update-config.yml.dist → .github/workflows/update-config.yml

@@ -9,8 +9,7 @@ jobs:
   update-config:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
-
+      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
     services:
       db:
         image: mysql:8
@@ -31,6 +30,12 @@ jobs:
         run: |
           gh run download -n latest.sql
 
+      - name: Prepare setup
+        run: |
+          # We install Drupal from existing dump, so locale_install() hook
+          # is never fired. Make sure the translations folder exists.
+          mkdir -p public/sites/default/files/translations -p
+
       - name: Build project
         run: |
           composer install --no-interaction

azure-pipelines-test.yml

@@ -3,7 +3,7 @@
 trigger:
   branches:
     include:
-      - develop
+      - dev
   paths:
     exclude:
       - README.md

compose.yaml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   app:
     container_name: "${COMPOSE_PROJECT_NAME}-app"

conf/cmi/core.extension.yml

@@ -34,7 +34,6 @@ module:
   entity_reference_revisions: 0
   environment_indicator: 0
   environment_indicator_ui: 0
-  features: 0
   field: 0
   field_group: 0
   field_ui: 0

docker/openshift/Dockerfile

@@ -1,4 +1,4 @@
-ARG DRUPAL_DOCKER_TAG=8.2
+ARG DRUPAL_DOCKER_TAG=8.3
 FROM ghcr.io/city-of-helsinki/drupal-docker-base:${DRUPAL_DOCKER_TAG}
 
 COPY / /var/www/html/

public/sites/default/all.settings.php

@@ -31,3 +31,20 @@
   $config['simple_oauth.settings']['private_key'] = '/app/conf/local-keys/private.key';
 }
 
+$additionalEnvVars = [
+  'PROJECT_NAME',
+  'REDIS_HOST',
+  'REDIS_PORT',
+  'SENTRY_DSN',
+  'SENTRY_ENVIRONMENT',
+  // Project specific variables.
+  'DRUPAL_PREVIEW_SECRET',
+  'ELASTIC_URL',
+  'ELASTIC_USER',
+  'ELASTIC_PASSWORD',
+  'INFOFINLAND_UI_PREVIEW_URL',
+  'INFOFINLAND_UI_URL'
+];
+foreach ($additionalEnvVars as $var) {
+  $preflight_checks['environmentVariables'][] = $var;
+}

tools/make/ansible.mk

@@ -1,27 +1,24 @@
-ANSIBLE_INVENTORY_PATH ?= ansible/inventory
 ANSIBLE_ROLES_PATH ?= ansible/roles
 ANSIBLE_CHECK_ROLE ?= geerlingguy.docker
 ANSIBLE_PLAYBOOK ?= ansible-playbook
 ANSIBLE_PROVISION ?= ansible/provision.yml
 ANSIBLE_REQUIREMENTS ?= ansible/requirements.yml
+ANSIBLE_FLAGS ?=
 
 PHONY += provision
-provision: INVENTORY ?= production
 provision: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make provisioning
 	$(call step,Ansible: Make dry run on provisioning...\n)
-	@$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION)
+	@$(ANSIBLE_PLAYBOOK) $(ANSIBLE_PROVISION) $(ANSIBLE_FLAGS)
 
 PHONY += provision-%
-provision-%: INVENTORY ?= production
 provision-%: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make provisioning by tag
 	$(call step,Ansible: Make provisioning by tag "$*"...\n)
-	@$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION) --tags="$*"
+	@$(ANSIBLE_PLAYBOOK) $(ANSIBLE_PROVISION) --tags="$*" $(ANSIBLE_FLAGS)
 
 PHONY += provision-dry-run
-provision-dry-run: INVENTORY ?= production
 provision-dry-run: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make dry run on provisioning
 	$(call step,Ansible: Make dry run on provisioning...\n)
-	@$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION) --check
+	@$(ANSIBLE_PLAYBOOK) $(ANSIBLE_PROVISION) $(ANSIBLE_FLAGS) --check
 
 PHONY += ansible-install-roles
 ansible-install-roles: ## Install Ansible roles

tools/make/project/install.mk

@@ -35,6 +35,7 @@ drush-helfi-enable-modules: ## Enable modules and base configurations.
 PHONY += drush-locale-update
 drush-locale-update: ## Update translations.
 	$(call step,Update translations...)
+	@mkdir -p public/sites/default/files/translations
 	$(call drush,state:set locale.translation_last_checked 0)
 	$(call drush,locale:check)
 	$(call drush,locale:update)