Merge pull request #278 from docksal/develop

Release 3.2.0

.github/workflows/default.yaml

@@ -80,7 +80,7 @@ jobs:
         if: ${{ env.ARCH == 'arm64' }}
         uses: arwynfr/actions-docker-context@v2
         with:
-          docker_host: "ssh://ubuntu@${{ secrets.ARM64_HOST }}"
+          docker_host: "ssh://build-agent@${{ secrets.ARM64_HOST }}"
           context_name: arm64-host
           ssh_key: "${{ secrets.ARM64_HOST_SSH_KEY }}"
           ssh_cert: "${{ env.ARM64_HOST_SSH_CERT }}"

7.4/Dockerfile

@@ -247,17 +247,17 @@ RUN set -xe; \
 # PHP tools (installed globally)
 ENV COMPOSER_DEFAULT_VERSION=2 \
 	COMPOSER_VERSION=1.10.25 \
-	COMPOSER2_VERSION=2.2.6 \
+	COMPOSER2_VERSION=2.2.10 \
 	DRUSH_VERSION=8.4.10 \
 	DRUSH_LAUNCHER_VERSION=0.10.1 \
 	DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \
 	WPCLI_VERSION=2.6.0 \
 	BLACKFIRE_VERSION=2.6.0 \
-	PLATFORMSH_CLI_VERSION=3.76.2 \
-	ACQUIA_CLI_VERSION=1.22.0 \
-	TERMINUS_VERSION=3.0.6 \
+	PLATFORMSH_CLI_VERSION=3.77.0 \
+	ACQUIA_CLI_VERSION=1.27.0 \
+	TERMINUS_VERSION=3.0.7 \
 	JQ_VERSION=1.6 \
-	YQ_VERSION=4.20.2
+	YQ_VERSION=4.24.2
 RUN set -xe; \
 	# Composer 1.x
 	curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \
@@ -293,13 +293,12 @@ RUN set -xe; \
 	# Make all downloaded binaries executable in one shot
 	(cd /usr/local/bin && chmod +x composer1 composer2 drush8 drush drupal wp blackfire platform acli terminus yq);
 
-# Install Python3 from Debian repos
-# This adds about 30MB to uncompressed image size.
-# TODO: some other dependency in this image installs python2. Which one?
+# Install Python 3 + pip from Debian repos
 RUN set -xe; \
 	apt-get update >/dev/null; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		python3 \
+		python3-pip \
 	;\
 	# Cleanup
 	apt-get clean; rm -rf /var/lib/apt/lists/*
@@ -343,9 +342,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil
 
 # Node.js (installed as user)
 ENV \
-	NVM_VERSION=0.38.0 \
-	NODE_VERSION=14.17.3 \
-	YARN_VERSION=1.22.10
+	NVM_VERSION=0.39.1 \
+	NODE_VERSION=16.14.0 \
+	YARN_VERSION=1.22.17
 # Don't use -x here, as the output may be excessive
 RUN set -e; \
 	# NVM and a defaut Node.js version

7.4/tests/essential-binaries.sh

@@ -24,6 +24,7 @@ nvm
 nslookup
 php
 ping
+pip
 psql
 pv
 python3

8.0/Dockerfile

@@ -247,17 +247,17 @@ RUN set -xe; \
 # PHP tools (installed globally)
 ENV COMPOSER_DEFAULT_VERSION=2 \
 	COMPOSER_VERSION=1.10.25 \
-	COMPOSER2_VERSION=2.2.6 \
+	COMPOSER2_VERSION=2.2.10 \
 	DRUSH_VERSION=8.4.10 \
 	DRUSH_LAUNCHER_VERSION=0.10.1 \
 	DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \
 	WPCLI_VERSION=2.6.0 \
 	BLACKFIRE_VERSION=2.6.0 \
-	PLATFORMSH_CLI_VERSION=3.76.2 \
-	ACQUIA_CLI_VERSION=1.22.0 \
-	TERMINUS_VERSION=3.0.6 \
+	PLATFORMSH_CLI_VERSION=3.77.0 \
+	ACQUIA_CLI_VERSION=1.27.0 \
+	TERMINUS_VERSION=3.0.7 \
 	JQ_VERSION=1.6 \
-	YQ_VERSION=4.20.2
+	YQ_VERSION=4.24.2
 RUN set -xe; \
 	# Composer 1.x
 	curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \
@@ -293,13 +293,12 @@ RUN set -xe; \
 	# Make all downloaded binaries executable in one shot
 	(cd /usr/local/bin && chmod +x composer1 composer2 drush8 drush drupal wp blackfire platform acli terminus yq);
 
-# Install Python3 from Debian repos
-# This adds about 30MB to uncompressed image size.
-# TODO: some other dependency in this image installs python2. Which one?
+# Install Python 3 + pip from Debian repos
 RUN set -xe; \
 	apt-get update >/dev/null; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		python3 \
+		python3-pip \
 	;\
 	# Cleanup
 	apt-get clean; rm -rf /var/lib/apt/lists/*
@@ -343,9 +342,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil
 
 # Node.js (installed as user)
 ENV \
-	NVM_VERSION=0.38.0 \
-	NODE_VERSION=14.17.3 \
-	YARN_VERSION=1.22.10
+	NVM_VERSION=0.39.1 \
+	NODE_VERSION=16.14.0 \
+	YARN_VERSION=1.22.17
 # Don't use -x here, as the output may be excessive
 RUN set -e; \
 	# NVM and a defaut Node.js version

8.0/tests/essential-binaries.sh

@@ -24,6 +24,7 @@ nvm
 nslookup
 php
 ping
+pip
 psql
 pv
 python3

8.1/Dockerfile

@@ -247,17 +247,17 @@ RUN set -xe; \
 # PHP tools (installed globally)
 ENV COMPOSER_DEFAULT_VERSION=2 \
 	COMPOSER_VERSION=1.10.25 \
-	COMPOSER2_VERSION=2.2.6 \
+	COMPOSER2_VERSION=2.2.10 \
 	DRUSH_VERSION=8.4.10 \
 	DRUSH_LAUNCHER_VERSION=0.10.1 \
 	DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \
 	WPCLI_VERSION=2.6.0 \
 	BLACKFIRE_VERSION=2.6.0 \
-	PLATFORMSH_CLI_VERSION=3.76.2 \
-	ACQUIA_CLI_VERSION=1.22.0 \
-	TERMINUS_VERSION=3.0.6 \
+	PLATFORMSH_CLI_VERSION=3.77.0 \
+	ACQUIA_CLI_VERSION=1.27.0 \
+	TERMINUS_VERSION=3.0.7 \
 	JQ_VERSION=1.6 \
-	YQ_VERSION=4.20.2
+	YQ_VERSION=4.24.2
 RUN set -xe; \
 	# Composer 1.x
 	curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \
@@ -293,13 +293,12 @@ RUN set -xe; \
 	# Make all downloaded binaries executable in one shot
 	(cd /usr/local/bin && chmod +x composer1 composer2 drush8 drush drupal wp blackfire platform acli terminus yq);
 
-# Install Python3 from Debian repos
-# This adds about 30MB to uncompressed image size.
-# TODO: some other dependency in this image installs python2. Which one?
+# Install Python 3 + pip from Debian repos
 RUN set -xe; \
 	apt-get update >/dev/null; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		python3 \
+		python3-pip \
 	;\
 	# Cleanup
 	apt-get clean; rm -rf /var/lib/apt/lists/*
@@ -343,9 +342,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil
 
 # Node.js (installed as user)
 ENV \
-	NVM_VERSION=0.38.0 \
-	NODE_VERSION=14.17.3 \
-	YARN_VERSION=1.22.10
+	NVM_VERSION=0.39.1 \
+	NODE_VERSION=16.14.0 \
+	YARN_VERSION=1.22.17
 # Don't use -x here, as the output may be excessive
 RUN set -e; \
 	# NVM and a defaut Node.js version

8.1/tests/essential-binaries.sh

@@ -24,6 +24,7 @@ nvm
 nslookup
 php
 ping
+pip
 psql
 pv
 python3

tests/test.bats

@@ -445,6 +445,10 @@ _healthcheck_wait ()
 @test "Check Pantheon integration" {
 	[[ $SKIP == 1 ]] && skip
 
+	# Disabled for the time being
+	# TODO: Figure out why these tests fail sporadically, then re-enable
+	skip
+
 	# Terminus v3 is not yet fully compatible with PHP 8.1
 	# TODO: Re-enable tests for Terminus v3 on PHP 8.1 once stable.
 	# See: https://github.com/pantheon-systems/terminus/issues/2256