From bf9445bc4919ef0b733e8d9e1128aeb60d199d13 Mon Sep 17 00:00:00 2001 From: Sean Dietrich Date: Thu, 21 Jul 2022 18:47:20 -0700 Subject: [PATCH 1/4] Updated Versions of Packages --- 7.4/Dockerfile | 24 ++++++++++++------------ 8.0/Dockerfile | 24 ++++++++++++------------ 8.1/Dockerfile | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 71b79c9b..5d723d59 100644 --- 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 \ + DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.8 \ 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,8 +345,8 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ NVM_VERSION=0.39.1 \ - NODE_VERSION=16.14.0 \ - YARN_VERSION=1.22.17 + NODE_VERSION=16.16.0 \ + YARN_VERSION=3.2.2 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version @@ -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 index 1835dd93..8d520e7d 100644 --- 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 \ + DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.8 \ 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,8 +345,8 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ NVM_VERSION=0.39.1 \ - NODE_VERSION=16.14.0 \ - YARN_VERSION=1.22.17 + NODE_VERSION=16.16.0 \ + YARN_VERSION=3.2.2 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version @@ -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 index 81651df4..ff340f98 100644 --- 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 \ + DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.8 \ 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,8 +345,8 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ NVM_VERSION=0.39.1 \ - NODE_VERSION=16.14.0 \ - YARN_VERSION=1.22.17 + NODE_VERSION=16.16.0 \ + YARN_VERSION=3.2.2 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version @@ -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 From 155a3e8141c44ec2201cecb6d78ae819980c953c Mon Sep 17 00:00:00 2001 From: Sean Dietrich Date: Thu, 21 Jul 2022 18:51:16 -0700 Subject: [PATCH 2/4] Fixed Drupal Console Version --- 7.4/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- 8.1/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 5d723d59..c907adf3 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -250,7 +250,7 @@ ENV COMPOSER_DEFAULT_VERSION=2 \ COMPOSER2_VERSION=2.3.10 \ DRUSH_VERSION=8.4.11 \ DRUSH_LAUNCHER_VERSION=0.10.1 \ - DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.8 \ + DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.6.0 \ BLACKFIRE_VERSION=2.10.0 \ PLATFORMSH_CLI_VERSION=3.80.3 \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 8d520e7d..c81cacd9 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -250,7 +250,7 @@ ENV COMPOSER_DEFAULT_VERSION=2 \ COMPOSER2_VERSION=2.3.10 \ DRUSH_VERSION=8.4.11 \ DRUSH_LAUNCHER_VERSION=0.10.1 \ - DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.8 \ + DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.6.0 \ BLACKFIRE_VERSION=2.10.0 \ PLATFORMSH_CLI_VERSION=3.80.3 \ diff --git a/8.1/Dockerfile b/8.1/Dockerfile index ff340f98..4dd4d495 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -250,7 +250,7 @@ ENV COMPOSER_DEFAULT_VERSION=2 \ COMPOSER2_VERSION=2.3.10 \ DRUSH_VERSION=8.4.11 \ DRUSH_LAUNCHER_VERSION=0.10.1 \ - DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.8 \ + DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.6.0 \ BLACKFIRE_VERSION=2.10.0 \ PLATFORMSH_CLI_VERSION=3.80.3 \ From 7f167269930bb5005d8ae3543b48e2204e2a71e6 Mon Sep 17 00:00:00 2001 From: Sean Dietrich Date: Thu, 21 Jul 2022 19:11:12 -0700 Subject: [PATCH 3/4] Reverted Yarn Version --- 7.4/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- 8.1/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index c907adf3..f8b75769 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -346,7 +346,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil ENV \ NVM_VERSION=0.39.1 \ NODE_VERSION=16.16.0 \ - YARN_VERSION=3.2.2 + 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 diff --git a/8.0/Dockerfile b/8.0/Dockerfile index c81cacd9..cf5f9206 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -346,7 +346,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil ENV \ NVM_VERSION=0.39.1 \ NODE_VERSION=16.16.0 \ - YARN_VERSION=3.2.2 + 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 diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 4dd4d495..d5ccf0cb 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -346,7 +346,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil ENV \ NVM_VERSION=0.39.1 \ NODE_VERSION=16.16.0 \ - YARN_VERSION=3.2.2 + 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 From f6e22140bc5873c088a8da586fae75b41823f633 Mon Sep 17 00:00:00 2001 From: Sean Dietrich Date: Fri, 22 Jul 2022 09:02:18 -0700 Subject: [PATCH 4/4] Downgraded ACLI version for 7.4 --- 7.4/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index f8b75769..0cdca379 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -254,7 +254,7 @@ ENV COMPOSER_DEFAULT_VERSION=2 \ WPCLI_VERSION=2.6.0 \ BLACKFIRE_VERSION=2.10.0 \ PLATFORMSH_CLI_VERSION=3.80.3 \ - ACQUIA_CLI_VERSION=2.1.0 \ + ACQUIA_CLI_VERSION=1.30.1 \ TERMINUS_VERSION=3.0.7 \ JQ_VERSION=1.6 \ YQ_VERSION=4.26.1