Merge branch 'develop'

docksal · Aug 2, 2022 · c81bf1a · c81bf1a
2 parents 5129ceb + a9391e8
commit c81bf1a
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 34 deletions.
diff --git a/.github/scripts/docker-tag-delete.sh b/.github/scripts/docker-tag-delete.sh
@@ -18,7 +18,7 @@ if [[ "${1}" == "" ]]; then
 	exit 1
 else
 	# Split image:tag
-	IFS=$':' read IMAGE TAG <<< ${1};
+	IFS=$':' read IMAGE TAG <<< "${1}";
 	# Remove registry prefix from image if present
 	IMAGE=${IMAGE#"docker.io/"}
 fi
@@ -42,4 +42,4 @@ output=$(curl -sI "https://hub.docker.com/v2/repositories/${IMAGE}/tags/${TAG}/"
 )
 
 # Return and error if HTTP response code is not 204
-echo "${output}" | grep "HTTP/1.1 204 NO CONTENT"
+echo "${output}" | grep -i "HTTP/1.1 204 No Content"
diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
@@ -282,5 +282,5 @@ jobs:
             docker manifest push ${tag}
           done
           # Clean up intermediate arch-specific image tags (DockerHub only)
-          .github/scripts/docker-tag-delete.sh ${{ env.BUILD_IMAGE_TAG }}-${{ env.GIT_SHA7 }}-amd64
-          .github/scripts/docker-tag-delete.sh ${{ env.BUILD_IMAGE_TAG }}-${{ env.GIT_SHA7 }}-arm64
+          .github/scripts/docker-tag-delete.sh "${{ env.BUILD_IMAGE_TAG }}-${{ env.GIT_SHA7 }}-amd64"
+          .github/scripts/docker-tag-delete.sh "${{ env.BUILD_IMAGE_TAG }}-${{ env.GIT_SHA7 }}-arm64"
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -247,17 +247,17 @@ RUN set -xe; \
 # PHP tools (installed globally)
 ENV COMPOSER_DEFAULT_VERSION=2 \
 	COMPOSER_VERSION=1.10.26 \
-	COMPOSER2_VERSION=2.2.12 \
-	DRUSH_VERSION=8.4.10 \
+	COMPOSER2_VERSION=2.3.10 \
+	DRUSH_VERSION=8.4.11 \
 	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.77.0 \
-	ACQUIA_CLI_VERSION=1.30.0 \
+	BLACKFIRE_VERSION=2.10.0 \
+	PLATFORMSH_CLI_VERSION=3.80.3 \
+	ACQUIA_CLI_VERSION=1.30.1 \
 	TERMINUS_VERSION=3.0.7 \
 	JQ_VERSION=1.6 \
-	YQ_VERSION=4.24.5
+	YQ_VERSION=4.26.1
 RUN set -xe; \
 	# Composer 1.x
 	curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \
@@ -345,7 +345,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil
 # Node.js (installed as user)
 ENV \
 	NVM_VERSION=0.39.1 \
-	NODE_VERSION=16.14.0 \
+	NODE_VERSION=16.16.0 \
 	YARN_VERSION=1.22.17
 # Don't use -x here, as the output may be excessive
 RUN set -e; \
@@ -510,9 +510,9 @@ USER docker
 ARG HOME=/home/docker
 
 ENV \
-	CODE_SERVER_VERSION=4.2.0 \
-	VSCODE_GITLENS_VERSION=12.0.5 \
-	VSCODE_XDEBUG_VERSION=1.25.0 \
+	CODE_SERVER_VERSION=4.5.1 \
+	VSCODE_GITLENS_VERSION=12.1.2 \
+	VSCODE_XDEBUG_VERSION=1.27.0 \
 	VSCODE_HOME="${HOME}/code-server"
 
 # Install code-server

diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -247,17 +247,17 @@ RUN set -xe; \
 # PHP tools (installed globally)
 ENV COMPOSER_DEFAULT_VERSION=2 \
 	COMPOSER_VERSION=1.10.26 \
-	COMPOSER2_VERSION=2.2.12 \
-	DRUSH_VERSION=8.4.10 \
+	COMPOSER2_VERSION=2.3.10 \
+	DRUSH_VERSION=8.4.11 \
 	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.77.0 \
-	ACQUIA_CLI_VERSION=1.30.0 \
+	BLACKFIRE_VERSION=2.10.0 \
+	PLATFORMSH_CLI_VERSION=3.80.3 \
+	ACQUIA_CLI_VERSION=2.1.0 \
 	TERMINUS_VERSION=3.0.7 \
 	JQ_VERSION=1.6 \
-	YQ_VERSION=4.24.5
+	YQ_VERSION=4.26.1
 RUN set -xe; \
 	# Composer 1.x
 	curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \
@@ -345,7 +345,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil
 # Node.js (installed as user)
 ENV \
 	NVM_VERSION=0.39.1 \
-	NODE_VERSION=16.14.0 \
+	NODE_VERSION=16.16.0 \
 	YARN_VERSION=1.22.17
 # Don't use -x here, as the output may be excessive
 RUN set -e; \
@@ -510,9 +510,9 @@ USER docker
 ARG HOME=/home/docker
 
 ENV \
-	CODE_SERVER_VERSION=4.2.0 \
-	VSCODE_GITLENS_VERSION=12.0.5 \
-	VSCODE_XDEBUG_VERSION=1.25.0 \
+	CODE_SERVER_VERSION=4.5.1 \
+	VSCODE_GITLENS_VERSION=12.1.2 \
+	VSCODE_XDEBUG_VERSION=1.27.0 \
 	VSCODE_HOME="${HOME}/code-server"
 
 # Install code-server

diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -247,17 +247,17 @@ RUN set -xe; \
 # PHP tools (installed globally)
 ENV COMPOSER_DEFAULT_VERSION=2 \
 	COMPOSER_VERSION=1.10.26 \
-	COMPOSER2_VERSION=2.2.12 \
-	DRUSH_VERSION=8.4.10 \
+	COMPOSER2_VERSION=2.3.10 \
+	DRUSH_VERSION=8.4.11 \
 	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.77.0 \
-	ACQUIA_CLI_VERSION=1.30.0 \
+	BLACKFIRE_VERSION=2.10.0 \
+	PLATFORMSH_CLI_VERSION=3.80.3 \
+	ACQUIA_CLI_VERSION=2.1.0 \
 	TERMINUS_VERSION=3.0.7 \
 	JQ_VERSION=1.6 \
-	YQ_VERSION=4.24.5
+	YQ_VERSION=4.26.1
 RUN set -xe; \
 	# Composer 1.x
 	curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \
@@ -345,7 +345,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil
 # Node.js (installed as user)
 ENV \
 	NVM_VERSION=0.39.1 \
-	NODE_VERSION=16.14.0 \
+	NODE_VERSION=16.16.0 \
 	YARN_VERSION=1.22.17
 # Don't use -x here, as the output may be excessive
 RUN set -e; \
@@ -510,9 +510,9 @@ USER docker
 ARG HOME=/home/docker
 
 ENV \
-	CODE_SERVER_VERSION=4.2.0 \
-	VSCODE_GITLENS_VERSION=12.0.5 \
-	VSCODE_XDEBUG_VERSION=1.25.0 \
+	CODE_SERVER_VERSION=4.5.1 \
+	VSCODE_GITLENS_VERSION=12.1.2 \
+	VSCODE_XDEBUG_VERSION=1.27.0 \
 	VSCODE_HOME="${HOME}/code-server"
 
 # Install code-server