From 2173ab58eaff2d5575664fc2ea71765927743bc7 Mon Sep 17 00:00:00 2001
From: Nigel Banks <nigel.g.banks@gmail.com>
Date: Thu, 11 May 2023 16:01:13 +0100
Subject: [PATCH] Allow drupal container to access broker via REST API

---
 drupal/Dockerfile                             | 3 +++
 test/rootfs/etc/s6-overlay/scripts/install.sh | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drupal/Dockerfile b/drupal/Dockerfile
index 6d8e877e..b6174ab3 100644
--- a/drupal/Dockerfile
+++ b/drupal/Dockerfile
@@ -46,6 +46,9 @@ ENV \
     DRUPAL_DEFAULT_BROKER_HOST=activemq \
     DRUPAL_DEFAULT_BROKER_PORT=61613 \
     DRUPAL_DEFAULT_BROKER_URL=tcp://activemq:61613 \
+    DRUPAL_DEFAULT_BROKER_WEB_ADMIN_PASSWORD=password \
+    DRUPAL_DEFAULT_BROKER_WEB_ADMIN_USER=admin \
+    DRUPAL_DEFAULT_BROKER_WEB_PORT=8161 \
     DRUPAL_DEFAULT_CANTALOUPE_URL=https://islandora.traefik.me/cantaloupe/iiif/2 \
     DRUPAL_DEFAULT_CONFIGDIR=/var/www/drupal/config/sync \
     DRUPAL_DEFAULT_DB_NAME=drupal_default \
diff --git a/test/rootfs/etc/s6-overlay/scripts/install.sh b/test/rootfs/etc/s6-overlay/scripts/install.sh
index fb802b36..b22859e4 100755
--- a/test/rootfs/etc/s6-overlay/scripts/install.sh
+++ b/test/rootfs/etc/s6-overlay/scripts/install.sh
@@ -20,11 +20,11 @@ function jolokia {
     local type="${1}"
     local queue="${2}"
     local action="${3}"
-    local url="http://${DRUPAL_DEFAULT_BROKER_HOST}:8161/api/jolokia/${type}/org.apache.activemq:type=Broker,brokerName=localhost,destinationType=Queue,destinationName=${queue}"
+    local url="http://${DRUPAL_DEFAULT_BROKER_HOST}:${DRUPAL_DEFAULT_BROKER_WEB_PORT}/api/jolokia/${type}/org.apache.activemq:type=Broker,brokerName=localhost,destinationType=Queue,destinationName=${queue}"
     if [ "$action" != "" ]; then
         url="${url}/$action"
     fi
-    curl -s -u "admin:password" "${url}"
+    curl -s -u "${DRUPAL_DEFAULT_BROKER_WEB_ADMIN_USER}:${DRUPAL_DEFAULT_BROKER_WEB_ADMIN_PASSWORD}" "${url}"
     printf "\n"
 }