Merge pull request #542 from UN-OCHA/develop

OPS-7743, OPS-7850, OPS-7907  Security update, config-split and seckit.

Author: lazysoundsystem

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

@@ -13,10 +13,22 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+    - name: Configure AWS Credentials
+      id: aws
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-1
+
     - name: Checkout code
+      id: checkout
       uses: actions/checkout@v1
+
     - name: Determine environment type
-      uses: docker://unocha/actions:determine-environment-main
+      id: env
+      uses: docker://ghcr.io/un-ocha/actions:determine-environment-main
+
     - name: Build docker image
       env:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
@@ -36,8 +48,9 @@ jobs:
             --build-arg GITHUB_REF=${GITHUB_REF} \
          . --file docker/Dockerfile --tag unocha/iasc-site:${DOCKER_TAG}
         docker push unocha/iasc-site:${DOCKER_TAG}
+
     - name: Flowdock Notify
-      uses: docker://unocha/actions:flowdock-notify-main
+      uses: docker://ghcr.io/un-ocha/actions:flowdock-notify-main
       env:
         FLOWDOCK_TOKEN: ${{ secrets.FLOWDOCK_TOKEN }}
         FLOWDOCK_ICON: 'package'

.travis.yml

@@ -23,6 +23,10 @@ services:
 #  - test -n "${SSH_AGENT_PID}" && ssh-agent -k
 
 before_script:
+  # Install the AWS CLI and login to the ECR. Credentials are secrets set via the UI.
+  - if ! [ -x "$(command -v aws)" ]; then curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" ; unzip awscliv2.zip ; sudo ./aws/install ; fi
+  - aws ecr-public get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin public.ecr.aws/unocha
+
   # Composer.
   - sed -i '1i export PATH="$HOME/.composer/vendor/bin:$PATH"' $HOME/.bashrc
   - source $HOME/.bashrc

README.md

@@ -12,6 +12,11 @@ The html directory is the document root. The vendor directories contains librari
 - Run `composer install`. This will download Drupal core, contributed modules, contributed themes and libraries.
 - Deploy the html and vendor directories to the web server(s).
 
+For local development, add this line to settings.local.php:
+`$config['config_split.config_split.config_dev']['status'] = TRUE;`
+After importing a fresh database, run `drush cim` to enable devel, database log
+and stage_file_proxy.
+
 ### Initialisation
 
 Use drush to bootstrap your site and import the initial configuration from the config subdirectory.

composer.json

@@ -29,7 +29,7 @@
         "drupal/colors": "1.x-dev",
         "drupal/components": "^2.4",
         "drupal/conditional_fields": "^4.0@alpha",
-        "drupal/config_split": "^1.4",
+        "drupal/config_split": "^2.0.0-beta4",
         "drupal/core-composer-scaffold": "^9.2.6",
         "drupal/core-project-message": "^9.2.6",
         "drupal/core-recommended": "^9.2.6",
@@ -67,11 +67,11 @@
         "drupal/search_api": "^1.14",
         "drupal/search_api_attachments": "^1.0@beta",
         "drupal/search_api_solr": "^4.1",
+        "drupal/seckit": "^2.0",
         "drupal/select2": "^1.6",
         "drupal/select_or_other": "^4.0",
         "drupal/social_auth_hid": "^2.2",
         "drupal/spamspan": "^1.2",
-        "drupal/stage_file_proxy": "^1.0",
         "drupal/tablefield": "^2.1",
         "drupal/token": "^1.5",
         "drupal/token_filter": "^1.2",
@@ -83,6 +83,7 @@
         "npm-asset/select2": "^4.0",
         "oomphinc/composer-installers-extender": "^2.0",
         "phpoffice/phpspreadsheet": "^1.16",
+        "symfony/flex": "^1.17",
         "unocha/common_design": "^5.0.0",
         "unocha/ocha_integrations": "^1.0",
         "unocha/un_date": "^1.0.1",
@@ -92,9 +93,13 @@
     },
     "require-dev": {
         "drupal/coder": "^8.3",
+        "drupal/config_filter": "^2.2",
         "drupal/core-dev": "^9.2.6",
+        "drupal/devel": "^4.1",
+        "drupal/stage_file_proxy": "^1.1",
         "drupal/upgrade_rector": "1.x-dev@dev",
         "drupal/upgrade_status": "^3.8",
+        "kint-php/kint": "^3.3",
         "phpmd/phpmd": "^2.6",
         "weitzman/drupal-test-traits": "^1.5",
         "weitzman/logintrait": "^1.1"
@@ -105,27 +110,10 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-		"bin-dir": "vendor/bin/",
+    "bin-dir": "vendor/bin/",
         "sort-packages": true
     },
-    "autoload": {
-        "classmap": [
-            "scripts/composer/ScriptHandler.php"
-        ]
-    },
     "scripts": {
-        "pre-install-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
-        "pre-update-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
-        "post-install-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
-        ],
-        "post-update-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
-        ],
         "sass-prepare": "cd html/themes/custom/iasc_common_design && npm install",
         "sass-build": "cd html/themes/custom/iasc_common_design && ./node_modules/.bin/sass sass:build",
         "sass-cleanup": "cd html/themes/custom/iasc_common_design && rm -rf ./node_modules",