Merge pull request #19 from dof-dss/D8UN-1804

D8UN-1804

Author: DuttonMa

.circleci/config.yml

@@ -14,10 +14,11 @@ default_docker_image: &docker_image
         PHP_INI_MAX_INPUT_TIME: 60
 custom_npm_docker_image: &custom_npm_docker_image
   docker:
-    - image: circleci/php:8.1-apache-browsers
+    - image: thecodingmachine/php:8.1-v4-apache-node14
       environment:
         PLATFORM_REGION: "uk-1.platform.sh"
-        PROJECT_ROOT: "/home/circleci/project"
+        PROJECT_ROOT: "/home/docker/project"
+        PHP_EXTENSIONS: "gd"
         # git variables to avoid empty committer identity errors
         EMAIL: "circleci@localhost"
         GIT_COMMITTER_NAME: "Circle CI"
@@ -67,6 +68,7 @@ commands:
       - run:
           name: Switch dof-dss packages to HEAD on development branch
           command: |
+            cd project
             composer require dof-dss/nicsdru_unity_theme:dev-development \
               dof-dss/nicsdru_origins_modules:dev-development \
                 dof-dss/nicsdru_unity_modules:dev-development
@@ -147,11 +149,9 @@ jobs:
       - run:
           name: Add OS and PHP extensions
           command: |
-            sudo cp $PROJECT_ROOT/.circleci/docker-php-circleci.ini /usr/local/etc/php/conf.d/
             wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
             sudo apt update --allow-releaseinfo-change
-            sudo apt install -y libpng-dev
-            sudo docker-php-ext-install gd pcntl posix
+            sudo apt install libjpeg-dev make python g++ -y
       - install_psh_cli
       - run:
           name: Switch to edge branch
@@ -167,16 +167,16 @@ jobs:
           command: |
             # Need to re-build site theme with any Unity changes.
             # Download and configure node and npm.
-            sudo apt install libjpeg-dev automake python -y
             git clone https://github.com/nvm-sh/nvm.git
             cd nvm
             chmod +x install.sh
             ./install.sh
       - run:
           name: Rebuild site themes
           command: |
-            export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+            export NVM_DIR="$HOME/.nvm"
+            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+            [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
             nvm install v15.14.0
             for site in `ls -l ~/project/project/sites | grep ^d | awk '{print $9}'`
             do

composer.json

@@ -93,6 +93,8 @@
         "drupal/date_facet_drilldown": "2.x-dev",
         "drupal/diff": "^1.0",
         "drupal/draggableviews": "^2.0",
+        "drupal/embed": "^1.6",
+        "drupal/entity_browser": "^2.9",
         "drupal/entity_embed": "^1.0",
         "drupal/entityqueue": "^1.2",
         "drupal/eu_cookie_compliance": "^1.8",
@@ -114,7 +116,7 @@
         "drupal/link_fix_absolute_urls": "^1.0",
         "drupal/linkit": "^6.0.0",
         "drupal/media_entity_browser": "^2.0",
-        "drupal/media_library_edit": "^2.0",
+        "drupal/media_library_edit": "^3.0",
         "drupal/menu_admin_per_menu": "^1.3",
         "drupal/menu_breadcrumb": "^1.13",
         "drupal/metatag": "1.16.0",