Merge branch 'develop'

.ahoy.yml

@@ -129,15 +129,7 @@ commands:
   ship-shape:
     usage: Run site validation scripts locally
     cmd: |
-      set -eu
-      APP_DIR="${APP_DIR:-/app}"
-      docker-compose exec -T cli ${APP_DIR}/vendor/bin/govcms-ship-shape
-      # Copy reports from container to local.
-      rm -rf ./.ship-shape
-      docker cp $(docker-compose ps -q cli):${APP_DIR}/.ship-shape ./
-      docker-compose exec -T cli rm -rf ${APP_DIR}/.ship-shape
-      echo "XML files have been generated at ./.ship-shape:"
-      find .ship-shape/ -type f -exec echo '  {}' \;
+      docker-compose exec -T cli shipshape -f /app/vendor/govcms/scaffold-tooling/shipshape.yml --exclude-db --error-code "$@"
 
   debug:
     usage: Enable debug configuration.

.docker/Dockerfile.paas

@@ -10,11 +10,15 @@ FROM govcms/govcms:${GOVCMS_IMAGE_VERSION} as base
 
 FROM govcms/govcms:${GOVCMS_IMAGE_VERSION}
 
+ARG GOVCMS_GITHUB_TOKEN
+
 ENV WEBROOT=web
 
 # Clean up base image so as not to conflict with any changes.
 RUN rm -rf /app
 
+RUN composer config --global github-oauth.github.com $GOVCMS_GITHUB_TOKEN
+
 COPY composer.* /app/
 COPY scripts /app/scripts
 COPY custom /app/custom

.docker/Dockerfile.solr.paas

@@ -1,21 +1,13 @@
 ##
 # @see  https://govcms.gov.au/wiki-advanced#docker
 #
-FROM uselagoon/solr-7.7-drupal:latest
+FROM uselagoon/solr-8
 
-# Based off search_api_solr/solr-conf-templates/7.x as a sane default.
-COPY .docker/config/solr /solr-conf/conf/
-
-USER root
-RUN sed -i -e "s#<dataDir>\${solr.data.dir:}#<dataDir>/var/solr/\${solr.core.name}#g" /solr-conf/conf/solrconfig.xml \
-    && sed -i -e "s#solr.lock.type:native#solr.lock.type:none#g" /solr-conf/conf/solrconfig.xml \
-    && sed -i -e "s#solr.install.dir=../../..#solr.install.dir=/opt/solr#g" /solr-conf/conf/solrcore.properties
-
-RUN sed -i -e "s#SEARCH_API_SOLR_MIN_SCHEMA_VERSION#8.3.8#g" /solr-conf/conf/schema.xml \
-    && sed -i -e "s#SEARCH_API_SOLR_MIN_SCHEMA_VERSION#8.3.8#g" /solr-conf/conf/solrconfig.xml \
-    && sed -i -e "s#drupal-8.3.4#drupal-8.3.8#g" /opt/solr/server/solr/mycores/drupal/conf/schema.xml \
-    && sed -i -e "s#drupal-8.3.4#drupal-8.3.8#g" /opt/solr/server/solr/mycores/drupal/conf/solrconfig.xml
+# Based off search_api_solr/jump-start/solr8/config-set as a sane default.
+COPY .docker/config/solr/ /opt/solr/server/solr/configsets/drupal/conf
 
 USER solr
-RUN precreate-core drupal /solr-conf/conf
-CMD ["solr-foreground"]
+
+# Note: The solr-recreate command will remove and replace.
+# If your configuration has changed you may need to reindex your solr index.
+CMD solr-recreate drupal /opt/solr/server/solr/configsets/drupal && solr-foreground

.docker/config/solr/accents_ca.txt

@@ -0,0 +1,185 @@
+# À => A
+#"\u00C0" => "A"
+# Á => A
+#"\u00C1" => "A"
+# Â => A
+#"\u00C2" => "A"
+# Ã => A
+"\u00C3" => "A"
+# Ä => A
+"\u00C4" => "A"
+# Å => A
+"\u00C5" => "A"
+# Ą => A
+"\u0104" => "A"
+# Æ => AE
+"\u00C6" => "AE"
+# Ç => C
+#"\u00C7" => "C"
+# Ć => C
+"\U0106" => "C"
+# È => E
+#"\u00C8" => "E"
+# É => E
+#"\u00C9" => "E"
+# Ê => E
+#"\u00CA" => "E"
+# Ë => E
+"\u00CB" => "E"
+# Ę => E
+"\u0118" => "E"
+# Ì => I
+#"\u00CC" => "I"
+# Í => I
+#"\u00CD" => "I"
+# Î => I
+#"\u00CE" => "I"
+# Ï => I
+"\u00CF" => "I"
+# IJ => IJ
+"\u0132" => "IJ"
+# Ð => D
+"\u00D0" => "D"
+# Ł => L
+"\u0141" => "L"
+# Ñ => N
+"\u00D1" => "N"
+# Ń => N
+"\u0143" => "N"
+# Ò => O
+#"\u00D2" => "O"
+# Ó => O
+#"\u00D3" => "O"
+# Ô => O
+#"\u00D4" => "O"
+# Õ => O
+"\u00D5" => "O"
+# Ö => O
+"\u00D6" => "O"
+# Ø => O
+"\u00D8" => "O"
+# Π=> OE
+"\u0152" => "OE"
+# Þ
+"\u00DE" => "TH"
+# Ù => U
+#"\u00D9" => "U"
+# Ú => U
+#"\u00DA" => "U"
+# Û => U
+#"\u00DB" => "U"
+# Ü => U
+"\u00DC" => "U"
+# Ý => Y
+#"\u00DD" => "Y"
+# Ÿ => Y
+"\u0178" => "Y"
+# à => a
+#"\u00E0" => "a"
+# á => a
+#"\u00E1" => "a"
+# â => a
+#"\u00E2" => "a"
+# ã => a
+"\u00E3" => "a"
+# ä => a
+"\u00E4" => "a"
+# å => a
+"\u00E5" => "a"
+# æ => ae
+"\u00E6" => "ae"
+# ç => c
+#"\u00E7" => "c"
+# è => e
+#"\u00E8" => "e"
+# é => e
+#"\u00E9" => "e"
+# ê => e
+#"\u00EA" => "e"
+# ë => e
+"\u00EB" => "e"
+# ì => i
+#"\u00EC" => "i"
+# í => i
+#"\u00ED" => "i"
+# î => i
+#"\u00EE" => "i"
+# ï => i
+"\u00EF" => "i"
+# ij => ij
+"\u0133" => "ij"
+# ð => d
+"\u00F0" => "d"
+# ñ => n
+"\u00F1" => "n"
+# ò => o
+#"\u00F2" => "o"
+# ó => o
+#"\u00F3" => "o"
+# ô => o
+#"\u00F4" => "o"
+# õ => o
+"\u00F5" => "o"
+# ö => o
+"\u00F6" => "o"
+# ø => o
+"\u00F8" => "o"
+# œ => oe
+"\u0153" => "oe"
+# ß => ss
+"\u00DF" => "ss"
+# Ś => S
+"\u015a" => "S"
+# þ => th
+"\u00FE" => "th"
+# ù => u
+#"\u00F9" => "u"
+# ú => u
+#"\u00FA" => "u"
+# û => u
+#"\u00FB" => "u"
+# ü => u
+"\u00FC" => "u"
+# ý => y
+#"\u00FD" => "y"
+# ÿ => y
+"\u00FF" => "y"
+# Ź => Z
+"\u0179" => "Z"
+# Ż => Z
+"\u017b" => "Z"
+# ff => ff
+"\uFB00" => "ff"
+# fi => fi
+"\uFB01" => "fi"
+# fl => fl
+"\uFB02" => "fl"
+# ffi => ffi
+"\uFB03" => "ffi"
+# ffl => ffl
+"\uFB04" => "ffl"
+# ſt => st
+"\uFB05" => "st"
+# st => st
+"\uFB06" => "st"
+# Māori macrons.
+# Ā => A
+"\u0100" => "A"
+# Ē => E
+"\u0112" => "E"
+# Ī => I
+"\u012A" => "I"
+# Ō => O
+"\u014C" => "O"
+# Ū => U
+"\u016A" => "U"
+# ā => a
+"\u0101" => "a"
+# ē => e
+"\u0113" => "e"
+# ī => i
+"\u012B" => "i"
+# ō => o
+"\u014D" => "o"
+# ū => u
+"\u016B" => "u"