Skip to content

Commit

Permalink
Update configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-bot authored Oct 19, 2023
1 parent e64c29b commit 6fe6227
Show file tree
Hide file tree
Showing 7 changed files with 150 additions and 69 deletions.
1 change: 1 addition & 0 deletions .platform/schema
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2
205 changes: 138 additions & 67 deletions composer.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ id: helfi_announcements
label: 'Helfi: Announcements'
label_plural: 'Helfi: Announcements'
description: ''
generate_aliases: null
read_only: true
generate_aliases: null
field_mapper_id: jsonpath
field_mapper_config:
field_mappings:
Expand Down
1 change: 1 addition & 0 deletions conf/cmi/views.view.editoria11y_dismissals.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
uuid: 05cadc7a-3c09-43b9-9a6d-be2b1159da7e
langcode: en
status: true
dependencies:
Expand Down
1 change: 1 addition & 0 deletions conf/cmi/views.view.editoria11y_results.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
uuid: bac64670-e014-40fa-8ca9-8fe22219c020
langcode: en
status: true
dependencies:
Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ services:
# Optionally, you can add this to your default environments variables to enable or disable
# xdebug by default (like /etc/environments, ~/.bashrc, or ~/.zshrc).
XDEBUG_ENABLE: "${XDEBUG_ENABLE:-false}"
XDEBUG_CONFIG: "${XDEBUG_CONFIG:-}"
PHP_IDE_CONFIG: "${PHP_IDE_CONFIG:-serverName=${DRUPAL_HOSTNAME}}"
# DOCKERHOST: host.docker.internal
# Use drush server to run functional tests, so we don't have to care about
# permission or SSL issues.
Expand Down Expand Up @@ -121,7 +123,7 @@ services:
container_name: "${COMPOSE_PROJECT_NAME}-artemis"
image: quay.io/artemiscloud/activemq-artemis-broker
environment:
AMQ_EXTRA_ARGS: "--nio --user admin --password admin"
AMQ_EXTRA_ARGS: "--user admin --password admin"
depends_on:
- app
networks:
Expand Down
5 changes: 5 additions & 0 deletions tools/make/project/install.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ endif
DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-uli

OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token')

SYNC_TARGETS := drush-sync-db

ifneq ($(DUMP_SQL_EXISTS),yes)
SYNC_TARGETS := oc-login oc-sync
endif

PHONY += oc-login
oc-login:
Expand Down

0 comments on commit 6fe6227

Please sign in to comment.