Merge pull request #58 from UN-OCHA/cafuego/fix-it-upstream

fix: Refactor some things that would break prod.

.github/workflows/docker-build-image.yml

@@ -0,0 +1,32 @@
+name: Build docker image
+
+on:
+# Set a correct docker_image variable and then remove the comments from this block to enable automagic builds.
+#  push:
+#    branches:
+#      - develop
+#      - 'feature/**'
+#      - main
+#  release:
+#    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Build
+      id: build-action
+      uses: UN-OCHA/actions/drupal-docker-build@main
+      with:
+        aws_access_key_id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+        aws_secret_access_key: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+        docker_registry_url: public.ecr.aws
+        docker_registry_path: /unocha/
+        docker_image: web-site
+        docker_username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+        docker_password: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
+        ecr_github_token: ${{ secrets.ECR_GITHUB_TOKEN }}
+        ecr_jenkins_token: ${{ secrets.JENKINS_ECR_TOKEN }}
+        slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
+        slack_channel_name: ${{ vars.SLACK_CHANNEL }}

.github/workflows/run-tests.yml

@@ -5,7 +5,13 @@ on: [pull_request]
 jobs:
   tests:
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: write
+      checks: write
+      pull-requests: write
+      actions: read
+      statuses: write
+
     steps:
       - name: Checkout Code
         id: checkout

docker/settings.php

@@ -31,12 +31,21 @@
   'collation' => getenv('DRUPAL_DB_COLLATION'),
 ]);
 
-// Load everything else from snippets under /srv/www/shared/settings.
-// @TODO: Use some sort of key/value store.
+// Inject some settings for local use and/or Drupal sanity checks.
+$settings['config_sync_directory'] = dirname($app_root) . '/config';
+$settings['hash_salt']             = 'cannabidol-chloride';
+
+/**
+  * Load generated settings.
+  * 
+  * Load everything else from snippets under /srv/www/shared/settings, where Ansible
+  * puts them. Do *not* add any (local) settings overrides below this block, as they
+  * will then override the Ansible-managed ones!
+  *
+  * @TODO: Use some sort of key/value store or vault.
+  */
 if (file_exists('/srv/www/shared/settings')) {
   foreach (glob('/srv/www/shared/settings/settings.*.php') as $filename) {
     include $filename;
   }
 }
-
-$settings['config_sync_directory'] = dirname($app_root) . '/config';