Merge pull request #77 from govCMS/release/3.2.0

Release 3.2.0
govCMS · Dec 14, 2023 · 11dbbcd · 11dbbcd
2 parents 49b8ab3 + 02a0a12
commit 11dbbcd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/.docker/Dockerfile.paas b/.docker/Dockerfile.paas
@@ -35,11 +35,9 @@ COPY . /app
 # Set up Drush aliases.
 COPY .docker/config/cli/govcms.site.yml /app/drush/sites/
 
-# Ensure drush-launcher instead of Drush 8 in /home/.composer
-# @todo Make drush launcher available upstream, @see https://github.com/amazeeio/lagoon/pull/1183
-RUN wget -O /usr/local/bin/drush "https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar" \
-  && chmod +x /usr/local/bin/drush \
-  && rm -Rf /home/.composer/vendor/bin
+# Remove Drush 8 in /home/.composer.
+RUN rm -Rf /home/.composer/vendor/bin
+ENV PATH="/app/vendor/bin:${PATH}"
 
 COPY --from=base /app/web/sites/all/modules/ /app/web/sites/all/modules/
 

diff --git a/.docker/config/cli/govcms.site.yml b/.docker/config/cli/govcms.site.yml
@@ -14,3 +14,5 @@ prod:
   uri: nginx-${env.LAGOON_PROJECT}-master.govcms.amazee.io
   ssh:
     options: -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30831 -F /dev/null
+  paths:
+    drush-script: /app/vendor/bin/drush
diff --git a/composer.10.json b/composer.10.json
@@ -8,18 +8,6 @@
         { "type": "composer", "url": "https://packages.drupal.org/8" },
         { "type": "composer", "url": "https://asset-packagist.org" },
         { "type": "vcs", "url": "[email protected]:govcms/govcms.git" },
-        {
-            "type": "package",
-            "package": {
-                "name": "harvesthq/chosen",
-                "version": "v1.8.7",
-                "type": "drupal-library",
-                "dist": {
-                    "type": "zip",
-                    "url": "https://github.com/harvesthq/chosen/releases/download/v1.8.7/chosen_v1.8.7.zip"
-                }
-            }
-        },
         {
             "type": "package",
             "package": {
@@ -38,7 +26,7 @@
         "govcms/govcms-custom": "*",
         "govcms/govcms": "3.x-master-dev",
         "govcms/scaffold-tooling": "10.x-master-dev",
-        "drush/drush": "^11",
+        "drush/drush": "^12",
         "composer/installers": "^2.0",
         "egulias/email-validator": "4.0.1 as 3.2.6"
     },

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -64,6 +64,9 @@ services:
     # https://pygmy.readthedocs.io/en/master/ssh_agent/
     volumes_from: ### Local overrides to mount host SSH keys. Automatically removed in CI.
       - container:amazeeio-ssh-agent ### Local overrides to mount host SSH keys. Automatically removed in CI.
+    networks:
+      - amazeeio-network
+      - default
 
   test:
     build:
@@ -80,6 +83,9 @@ services:
       - cli
     environment:
       << : *default-environment
+    networks:
+      - amazeeio-network
+      - default
 
   nginx:
     build:
@@ -117,6 +123,9 @@ services:
       - cli
     environment:
       << : *default-environment
+    networks:
+      - amazeeio-network
+      - default
 
   mariadb:
     image: ${MARIADB_DATA_IMAGE:-govcms/mariadb-drupal:{{ GOVCMS_VERSION }}.x-latest}

diff --git a/drush/sites/feature.site.yml b/drush/sites/feature.site.yml
@@ -13,3 +13,5 @@
   ssh:
     options: -p 30831
     tty: false
+  paths:
+    drush-script: /app/vendor/bin/drush