Merge remote-tracking branch 'origin/5.x' into build/DDS-1576--update…

…d-ci-runner
dpc-sdp · Oct 3, 2023 · 2d5dc33 · 2d5dc33
2 parents 5cf0071 + 78e50df
commit 2d5dc33
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -76,7 +76,14 @@ jobs:
           command: IMAGE_TAG=$(.circleci/scripts/tag.sh) tests/run.sh
       - run:
           name: Build the AWX EE
-          command: ansible-builder build --verbosity 3 --context=images/awx-ee/context --tag singledigital/awx-ee:latest --container-runtime docker -f images/awx-ee/execution-environment.yml
+          command: |
+            pip install --upgrade ansible-builder
+            cd images/awx-ee
+            ansible-builder build \
+              --file execution-environment.yml \
+              --build-arg PYCMD="/usr/local/bin/python3" \
+              --build-arg PKGMGR="/usr/bin/apt-get" \
+              --verbosity 3
 
       - slack/notify:
           channel: G015H7K158D

diff --git a/images/php/settings.php b/images/php/settings.php
@@ -82,6 +82,9 @@
 // The default number of entities to update in a batch process.
 $settings['entity_update_batch_size'] = 50;
 
+// The token for the bay_monitoring Healthz endpoint.
+$settings['baywatch.healthz_key'] = getenv('BAY_HEALTHZ_TOKEN');
+
 // Environment indicator settings.
 $config['environment_indicator.indicator']['name'] = isset($settings['environment']) ? $settings['environment'] : 'local';
 $config['environment_indicator.indicator']['bg_color'] = !empty($config['environment_indicator.indicator']['bg_color']) ? $config['environment_indicator.indicator']['bg_color'] : 'green';