diff --git a/.github/scripts/docker-tags.sh b/.github/scripts/docker-tags.sh index a9a2d2b9..9631c143 100755 --- a/.github/scripts/docker-tags.sh +++ b/.github/scripts/docker-tags.sh @@ -9,7 +9,7 @@ # Declare expected variables IMAGE=${IMAGE} # docksal/cli VERSION_PREFIX=${VERSION_PREFIX} # php -VERSION=${VERSION} # 7.4 +VERSION=${VERSION} # 8.1 VERSION_SUFFIX=${VERSION_SUFFIX} # ide REGISTRY="${REGISTRY}" # ghcr.io GITHUB_REF=${GITHUB_REF} # refs/heads/develop, refs/heads/master, refs/tags/v1.0.0 diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index a9b41964..2f19eeea 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -19,7 +19,7 @@ defaults: env: IMAGE: docksal/cli UPSTREAM_IMAGE: debian - LATEST_VERSION: '8.1' + LATEST_VERSION: '8.2' DOCKSAL_VERSION: develop jobs: @@ -34,27 +34,27 @@ jobs: - platform: linux/amd64 arch: amd64 - version: '7.4' + version: '8.0' - platform: linux/amd64 arch: amd64 - version: '8.0' + version: '8.1' - platform: linux/amd64 arch: amd64 - version: '8.1' + version: '8.2' - platform: linux/arm64 arch: arm64 - version: '7.4' + version: '8.0' - platform: linux/arm64 arch: arm64 - version: '8.0' + version: '8.1' - platform: linux/arm64 arch: arm64 - version: '8.1' + version: '8.2' env: ARCH: ${{ matrix.arch }} @@ -123,27 +123,27 @@ jobs: - platform: linux/amd64 arch: amd64 - version: '7.4' + version: '8.0' - platform: linux/amd64 arch: amd64 - version: '8.0' + version: '8.1' - platform: linux/amd64 arch: amd64 - version: '8.1' + version: '8.2' - platform: linux/arm64 arch: arm64 - version: '7.4' + version: '8.0' - platform: linux/arm64 arch: arm64 - version: '8.0' + version: '8.1' - platform: linux/arm64 arch: arm64 - version: '8.1' + version: '8.2' env: ARCH: ${{ matrix.arch }} @@ -217,9 +217,9 @@ jobs: strategy: matrix: version: - - '7.4' - '8.0' - '8.1' + - '8.2' env: VERSION_PREFIX: php diff --git a/8.0/Dockerfile b/8.0/Dockerfile index b97dd6fd..3be3f60f 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.27-fpm-bullseye as cli +FROM php:8.0.28-fpm-bullseye as cli ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive @@ -217,53 +217,53 @@ RUN set -xe; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps >/dev/null; \ apt-get clean; rm -rf /var/lib/apt/lists/* -# Packages not available for arm64 +# MSSQL PHP client RUN set -xe; \ - if [ "${TARGETARCH}" = "amd64" ]; then \ - # MSQSQL repo - msodbcsql17, pecl/sqlsrv and pecl/pdo_sqlsrv (PHP 7.0+ only) - curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ - echo 'deb https://packages.microsoft.com/debian/11/prod bullseye main' | tee /etc/apt/sources.list.d/mssql.list; \ - \ - buildDeps=" \ - unixodbc-dev \ - "; \ - apt-get update >/dev/null; \ - # Necessary for msodbcsql17 (MSSQL) - ACCEPT_EULA=Y \ - apt-get -y --no-install-recommends install >/dev/null \ - $buildDeps \ - msodbcsql17 \ - ;\ - pecl update-channels; \ - pecl install >/dev/null /dev/null; \ - apt-get clean; rm -rf /var/lib/apt/lists/*; \ - fi + # Repo for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv + curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ + # TODO: Using Ubuntu 22.04 packages as a temporary fix (until addressed upstream in MS repos). + #curl -fsSL https://packages.microsoft.com/config/debian/11/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + \ + buildDeps=" \ + unixodbc-dev \ + "; \ + apt-get update >/dev/null; \ + # Necessary for msodbcsql18 (MSSQL) + ACCEPT_EULA=Y \ + apt-get -y --no-install-recommends install >/dev/null \ + $buildDeps \ + msodbcsql18 \ + ;\ + pecl update-channels; \ + pecl install >/dev/null /dev/null; \ + apt-get clean; rm -rf /var/lib/apt/lists/* # PHP tools (installed globally) ENV \ COMPOSER_DEFAULT_VERSION=2 \ COMPOSER_VERSION=1.10.26 \ - COMPOSER2_VERSION=2.5.1 \ - DRUSH_VERSION=8.4.11 \ + COMPOSER2_VERSION=2.5.5 \ + DRUSH_VERSION=8.4.12 \ DRUSH_LAUNCHER_VERSION=0.10.1 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.7.1 \ BLACKFIRE_VERSION=2.10.0 \ - PLATFORMSH_CLI_VERSION=4.0.2 \ - ACQUIA_CLI_VERSION=2.7.0 \ - TERMINUS_VERSION=3.1.2 \ + PLATFORMSH_CLI_VERSION=4.4.0 \ + ACQUIA_CLI_VERSION=2.9.3 \ + TERMINUS_VERSION=3.1.4 \ JQ_VERSION=1.6 \ - YQ_VERSION=4.30.8 + YQ_VERSION=4.32.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; \ @@ -282,7 +282,7 @@ RUN set -xe; \ # curl -X GET -Is https://blackfire.io/api/v1/releases/cli/linux/amd64 | grep location | awk '{print $2}' curl -fsSL "https://packages.blackfire.io/binaries/blackfire/${BLACKFIRE_VERSION}/blackfire-linux_${TARGETARCH}" -o /usr/local/bin/blackfire; \ # Platform.sh CLI - curl -fsSL "https://github.com/platformsh/platformsh-cli/releases/download/v${PLATFORMSH_CLI_VERSION}/platform.phar" -o /usr/local/bin/platform; \ + curl -fsSL "https://github.com/platformsh/legacy-cli/releases/download/v${PLATFORMSH_CLI_VERSION}/platform.phar" -o /usr/local/bin/platform; \ # Acquia CLI curl -fsSL "https://github.com/acquia/cli/releases/download/${ACQUIA_CLI_VERSION}/acli.phar" -o /usr/local/bin/acli; \ # Pantheon Terminus @@ -351,7 +351,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ NVM_VERSION=0.39.3 \ - NODE_VERSION=18.13.0 \ + NODE_VERSION=18.15.0 \ YARN_VERSION=1.22.19 # Don't use -x here, as the output may be excessive RUN set -e; \ @@ -516,9 +516,9 @@ USER docker ARG HOME=/home/docker ENV \ - CODE_SERVER_VERSION=4.9.1 \ - VSCODE_GITLENS_VERSION=13.2.0 \ - VSCODE_XDEBUG_VERSION=1.30.0 \ + CODE_SERVER_VERSION=4.10.1 \ + VSCODE_GITLENS_VERSION=13.2.2 \ + VSCODE_XDEBUG_VERSION=1.32.0 \ VSCODE_HOME="${HOME}/code-server" # Install code-server diff --git a/8.0/tests/php-modules.sh b/8.0/tests/php-modules.sh index 8037c6d1..0d671ced 100755 --- a/8.0/tests/php-modules.sh +++ b/8.0/tests/php-modules.sh @@ -108,6 +108,7 @@ PDO pdo_mysql pdo_pgsql pdo_sqlite +pdo_sqlsrv pgsql Phar posix @@ -121,6 +122,7 @@ sockets sodium SPL sqlite3 +sqlsrv ssh2 standard sysvsem diff --git a/8.1/Dockerfile b/8.1/Dockerfile index e9c75945..736f10db 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.14-fpm-bullseye as cli +FROM php:8.1.16-fpm-bullseye as cli ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive @@ -217,53 +217,53 @@ RUN set -xe; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps >/dev/null; \ apt-get clean; rm -rf /var/lib/apt/lists/* -# Packages not available for arm64 +# MSSQL PHP client RUN set -xe; \ - if [ "${TARGETARCH}" = "amd64" ]; then \ - # MSQSQL repo - msodbcsql17, pecl/sqlsrv and pecl/pdo_sqlsrv (PHP 7.0+ only) - curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ - echo 'deb https://packages.microsoft.com/debian/11/prod bullseye main' | tee /etc/apt/sources.list.d/mssql.list; \ - \ - buildDeps=" \ - unixodbc-dev \ - "; \ - apt-get update >/dev/null; \ - # Necessary for msodbcsql17 (MSSQL) - ACCEPT_EULA=Y \ - apt-get -y --no-install-recommends install >/dev/null \ - $buildDeps \ - msodbcsql17 \ - ;\ - pecl update-channels; \ - pecl install >/dev/null /dev/null; \ - apt-get clean; rm -rf /var/lib/apt/lists/*; \ - fi + # Repo for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv + curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ + # TODO: Using Ubuntu 22.04 packages as a temporary fix (until addressed upstream in MS repos). + #curl -fsSL https://packages.microsoft.com/config/debian/11/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + \ + buildDeps=" \ + unixodbc-dev \ + "; \ + apt-get update >/dev/null; \ + # Necessary for msodbcsql18 (MSSQL) + ACCEPT_EULA=Y \ + apt-get -y --no-install-recommends install >/dev/null \ + $buildDeps \ + msodbcsql18 \ + ;\ + pecl update-channels; \ + pecl install >/dev/null /dev/null; \ + apt-get clean; rm -rf /var/lib/apt/lists/* # PHP tools (installed globally) ENV \ COMPOSER_DEFAULT_VERSION=2 \ COMPOSER_VERSION=1.10.26 \ - COMPOSER2_VERSION=2.5.1 \ - DRUSH_VERSION=8.4.11 \ + COMPOSER2_VERSION=2.5.5 \ + DRUSH_VERSION=8.4.12 \ DRUSH_LAUNCHER_VERSION=0.10.1 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.7.1 \ BLACKFIRE_VERSION=2.10.0 \ - PLATFORMSH_CLI_VERSION=4.0.2 \ - ACQUIA_CLI_VERSION=2.7.0 \ - TERMINUS_VERSION=3.1.2 \ + PLATFORMSH_CLI_VERSION=4.4.0 \ + ACQUIA_CLI_VERSION=2.9.3 \ + TERMINUS_VERSION=3.1.4 \ JQ_VERSION=1.6 \ - YQ_VERSION=4.30.8 + YQ_VERSION=4.32.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; \ @@ -282,7 +282,7 @@ RUN set -xe; \ # curl -X GET -Is https://blackfire.io/api/v1/releases/cli/linux/amd64 | grep location | awk '{print $2}' curl -fsSL "https://packages.blackfire.io/binaries/blackfire/${BLACKFIRE_VERSION}/blackfire-linux_${TARGETARCH}" -o /usr/local/bin/blackfire; \ # Platform.sh CLI - curl -fsSL "https://github.com/platformsh/platformsh-cli/releases/download/v${PLATFORMSH_CLI_VERSION}/platform.phar" -o /usr/local/bin/platform; \ + curl -fsSL "https://github.com/platformsh/legacy-cli/releases/download/v${PLATFORMSH_CLI_VERSION}/platform.phar" -o /usr/local/bin/platform; \ # Acquia CLI curl -fsSL "https://github.com/acquia/cli/releases/download/${ACQUIA_CLI_VERSION}/acli.phar" -o /usr/local/bin/acli; \ # Pantheon Terminus @@ -351,7 +351,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ NVM_VERSION=0.39.3 \ - NODE_VERSION=18.13.0 \ + NODE_VERSION=18.15.0 \ YARN_VERSION=1.22.19 # Don't use -x here, as the output may be excessive RUN set -e; \ @@ -516,9 +516,9 @@ USER docker ARG HOME=/home/docker ENV \ - CODE_SERVER_VERSION=4.9.1 \ - VSCODE_GITLENS_VERSION=13.2.0 \ - VSCODE_XDEBUG_VERSION=1.30.0 \ + CODE_SERVER_VERSION=4.10.1 \ + VSCODE_GITLENS_VERSION=13.2.2 \ + VSCODE_XDEBUG_VERSION=1.32.0 \ VSCODE_HOME="${HOME}/code-server" # Install code-server diff --git a/8.1/tests/php-modules.sh b/8.1/tests/php-modules.sh index 8037c6d1..0d671ced 100755 --- a/8.1/tests/php-modules.sh +++ b/8.1/tests/php-modules.sh @@ -108,6 +108,7 @@ PDO pdo_mysql pdo_pgsql pdo_sqlite +pdo_sqlsrv pgsql Phar posix @@ -121,6 +122,7 @@ sockets sodium SPL sqlite3 +sqlsrv ssh2 standard sysvsem diff --git a/7.4/.dockerignore b/8.2/.dockerignore similarity index 100% rename from 7.4/.dockerignore rename to 8.2/.dockerignore diff --git a/7.4/Dockerfile b/8.2/Dockerfile similarity index 92% rename from 7.4/Dockerfile rename to 8.2/Dockerfile index 9157326c..4566980e 100644 --- a/7.4/Dockerfile +++ b/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.33-fpm-bullseye as cli +FROM php:8.2.3-fpm-bullseye as cli ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive @@ -200,8 +200,7 @@ RUN set -xe; \ memcached \ redis \ ssh2-beta \ - # xdebug v3.1.6 is the last version to support PHP 7.4 - xdebug-3.1.6 \ + xdebug \ xhprof \ ;\ docker-php-ext-enable \ @@ -218,54 +217,53 @@ RUN set -xe; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps >/dev/null; \ apt-get clean; rm -rf /var/lib/apt/lists/* -# Packages not available for arm64 +# MSSQL PHP client RUN set -xe; \ - if [ "${TARGETARCH}" = "amd64" ]; then \ - # MSQSQL repo - msodbcsql17, pecl/sqlsrv and pecl/pdo_sqlsrv (PHP 7.0+ only) - curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ - echo 'deb https://packages.microsoft.com/debian/11/prod bullseye main' | tee /etc/apt/sources.list.d/mssql.list; \ - \ - buildDeps=" \ - unixodbc-dev \ - "; \ - apt-get update >/dev/null; \ - # Necessary for msodbcsql17 (MSSQL) - ACCEPT_EULA=Y \ - apt-get -y --no-install-recommends install >/dev/null \ - $buildDeps \ - msodbcsql17 \ - ;\ - pecl update-channels; \ - pecl install >/dev/null /dev/null; \ - apt-get clean; rm -rf /var/lib/apt/lists/*; \ - fi + # Repo for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv + curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ + # TODO: Using Ubuntu 22.04 packages as a temporary fix (until addressed upstream in MS repos). + #curl -fsSL https://packages.microsoft.com/config/debian/11/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + \ + buildDeps=" \ + unixodbc-dev \ + "; \ + apt-get update >/dev/null; \ + # Necessary for msodbcsql18 (MSSQL) + ACCEPT_EULA=Y \ + apt-get -y --no-install-recommends install >/dev/null \ + $buildDeps \ + msodbcsql18 \ + ;\ + pecl update-channels; \ + pecl install >/dev/null /dev/null; \ + apt-get clean; rm -rf /var/lib/apt/lists/* # PHP tools (installed globally) ENV \ COMPOSER_DEFAULT_VERSION=2 \ COMPOSER_VERSION=1.10.26 \ - COMPOSER2_VERSION=2.5.1 \ - DRUSH_VERSION=8.4.11 \ + COMPOSER2_VERSION=2.5.5 \ + DRUSH_VERSION=8.4.12 \ DRUSH_LAUNCHER_VERSION=0.10.1 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.7.1 \ BLACKFIRE_VERSION=2.10.0 \ - PLATFORMSH_CLI_VERSION=4.0.2 \ - # acquia/cli v1.30.1 is the last version to support PHP 7.4 - ACQUIA_CLI_VERSION=1.30.1 \ - TERMINUS_VERSION=3.1.2 \ + PLATFORMSH_CLI_VERSION=4.4.0 \ + ACQUIA_CLI_VERSION=2.9.3 \ + TERMINUS_VERSION=3.1.4 \ JQ_VERSION=1.6 \ - YQ_VERSION=4.30.8 + YQ_VERSION=4.32.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; \ @@ -284,7 +282,7 @@ RUN set -xe; \ # curl -X GET -Is https://blackfire.io/api/v1/releases/cli/linux/amd64 | grep location | awk '{print $2}' curl -fsSL "https://packages.blackfire.io/binaries/blackfire/${BLACKFIRE_VERSION}/blackfire-linux_${TARGETARCH}" -o /usr/local/bin/blackfire; \ # Platform.sh CLI - curl -fsSL "https://github.com/platformsh/platformsh-cli/releases/download/v${PLATFORMSH_CLI_VERSION}/platform.phar" -o /usr/local/bin/platform; \ + curl -fsSL "https://github.com/platformsh/legacy-cli/releases/download/v${PLATFORMSH_CLI_VERSION}/platform.phar" -o /usr/local/bin/platform; \ # Acquia CLI curl -fsSL "https://github.com/acquia/cli/releases/download/${ACQUIA_CLI_VERSION}/acli.phar" -o /usr/local/bin/acli; \ # Pantheon Terminus @@ -353,7 +351,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ NVM_VERSION=0.39.3 \ - NODE_VERSION=18.13.0 \ + NODE_VERSION=18.15.0 \ YARN_VERSION=1.22.19 # Don't use -x here, as the output may be excessive RUN set -e; \ @@ -518,9 +516,9 @@ USER docker ARG HOME=/home/docker ENV \ - CODE_SERVER_VERSION=4.9.1 \ - VSCODE_GITLENS_VERSION=13.2.0 \ - VSCODE_XDEBUG_VERSION=1.30.0 \ + CODE_SERVER_VERSION=4.10.1 \ + VSCODE_GITLENS_VERSION=13.2.2 \ + VSCODE_XDEBUG_VERSION=1.32.0 \ VSCODE_HOME="${HOME}/code-server" # Install code-server diff --git a/7.4/Makefile b/8.2/Makefile similarity index 99% rename from 7.4/Makefile rename to 8.2/Makefile index 3b167570..009a6879 100644 --- a/7.4/Makefile +++ b/8.2/Makefile @@ -3,7 +3,7 @@ IMAGE ?= docksal/cli VERSION_PREFIX ?= php -VERSION ?= 7.4 +VERSION ?= 8.2 BUILD_IMAGE_TAG ?= $(IMAGE):$(VERSION_PREFIX)$(VERSION)-build NAME = docksal-cli-$(VERSION)-$(GIT_SHA7) CWD = $(shell pwd) diff --git a/7.4/config/.ssh/config b/8.2/config/.ssh/config similarity index 100% rename from 7.4/config/.ssh/config rename to 8.2/config/.ssh/config diff --git a/7.4/config/.ssh/id_rsa.tmpl b/8.2/config/.ssh/id_rsa.tmpl similarity index 100% rename from 7.4/config/.ssh/id_rsa.tmpl rename to 8.2/config/.ssh/id_rsa.tmpl diff --git a/7.4/config/.terminus/config.yml b/8.2/config/.terminus/config.yml similarity index 100% rename from 7.4/config/.terminus/config.yml rename to 8.2/config/.terminus/config.yml diff --git a/7.4/config/code-server/User/settings.json b/8.2/config/code-server/User/settings.json similarity index 100% rename from 7.4/config/code-server/User/settings.json rename to 8.2/config/code-server/User/settings.json diff --git a/7.4/config/code-server/config.yaml.tmpl b/8.2/config/code-server/config.yaml.tmpl similarity index 100% rename from 7.4/config/code-server/config.yaml.tmpl rename to 8.2/config/code-server/config.yaml.tmpl diff --git a/7.4/config/php/opcache.ini b/8.2/config/php/opcache.ini similarity index 100% rename from 7.4/config/php/opcache.ini rename to 8.2/config/php/opcache.ini diff --git a/7.4/config/php/xdebug.ini b/8.2/config/php/xdebug.ini similarity index 100% rename from 7.4/config/php/xdebug.ini rename to 8.2/config/php/xdebug.ini diff --git a/7.4/config/php/xhprof.ini b/8.2/config/php/xhprof.ini similarity index 100% rename from 7.4/config/php/xhprof.ini rename to 8.2/config/php/xhprof.ini diff --git a/7.4/config/php/zz-php-fpm.conf b/8.2/config/php/zz-php-fpm.conf similarity index 100% rename from 7.4/config/php/zz-php-fpm.conf rename to 8.2/config/php/zz-php-fpm.conf diff --git a/7.4/config/php/zz-php.ini b/8.2/config/php/zz-php.ini similarity index 100% rename from 7.4/config/php/zz-php.ini rename to 8.2/config/php/zz-php.ini diff --git a/7.4/config/supervisor/supervisord-code-server.conf.tmpl b/8.2/config/supervisor/supervisord-code-server.conf.tmpl similarity index 100% rename from 7.4/config/supervisor/supervisord-code-server.conf.tmpl rename to 8.2/config/supervisor/supervisord-code-server.conf.tmpl diff --git a/7.4/config/supervisor/supervisord-crond.conf b/8.2/config/supervisor/supervisord-crond.conf similarity index 100% rename from 7.4/config/supervisor/supervisord-crond.conf rename to 8.2/config/supervisor/supervisord-crond.conf diff --git a/7.4/config/supervisor/supervisord-php-fpm.conf b/8.2/config/supervisor/supervisord-php-fpm.conf similarity index 100% rename from 7.4/config/supervisor/supervisord-php-fpm.conf rename to 8.2/config/supervisor/supervisord-php-fpm.conf diff --git a/7.4/config/supervisor/supervisord-sshd.conf b/8.2/config/supervisor/supervisord-sshd.conf similarity index 100% rename from 7.4/config/supervisor/supervisord-sshd.conf rename to 8.2/config/supervisor/supervisord-sshd.conf diff --git a/7.4/config/supervisor/supervisord.conf b/8.2/config/supervisor/supervisord.conf similarity index 100% rename from 7.4/config/supervisor/supervisord.conf rename to 8.2/config/supervisor/supervisord.conf diff --git a/7.4/healthcheck.sh b/8.2/healthcheck.sh similarity index 100% rename from 7.4/healthcheck.sh rename to 8.2/healthcheck.sh diff --git a/7.4/ping-web.sh b/8.2/ping-web.sh similarity index 100% rename from 7.4/ping-web.sh rename to 8.2/ping-web.sh diff --git a/7.4/startup.sh b/8.2/startup.sh similarity index 100% rename from 7.4/startup.sh rename to 8.2/startup.sh diff --git a/7.4/tests/essential-binaries.sh b/8.2/tests/essential-binaries.sh similarity index 100% rename from 7.4/tests/essential-binaries.sh rename to 8.2/tests/essential-binaries.sh diff --git a/7.4/tests/php-modules.sh b/8.2/tests/php-modules.sh similarity index 97% rename from 7.4/tests/php-modules.sh rename to 8.2/tests/php-modules.sh index 8037c6d1..c869be2b 100755 --- a/7.4/tests/php-modules.sh +++ b/8.2/tests/php-modules.sh @@ -42,6 +42,7 @@ pdo_sqlsrv pgsql Phar posix +random readline redis Reflection @@ -108,9 +109,11 @@ PDO pdo_mysql pdo_pgsql pdo_sqlite +pdo_sqlsrv pgsql Phar posix +random readline redis Reflection @@ -121,6 +124,7 @@ sockets sodium SPL sqlite3 +sqlsrv ssh2 standard sysvsem diff --git a/README.md b/README.md index 2b3603cd..1a053c6d 100644 --- a/README.md +++ b/README.md @@ -21,16 +21,15 @@ This image(s) is part of the [Docksal](https://docksal.io) image library. ## Versions and image tag naming convention - Stable versions v3 (amd64/arm64) - - `php7.4-3.0`, `php7.4-2`, `php7.4` - PHP 7.4 - - `php8.0-3.0`, `php8.0`, `php8.0`, `latest` - PHP 8.0 + - `php8.0-3.0`, `php8.0`, `php8.0` - PHP 8.0 - `php8.1-3.0`, `php8.1`, `php8.1`, `latest` - PHP 8.1 - Development versions (amd64/arm64) - - `php7.4-edge` - PHP 7.4 - `php8.0-edge` - PHP 8.0 - `php8.1-edge` - PHP 8.0 -- Previous stable versions v3 (amd64/arm64) +- Legacy versions v3 (amd64/arm64) - `php7.3-3.0`, `php7.3-2`, `php7.3` - PHP 7.3 -- Previous stable versions v2 (amd64) + - `php7.4-3.3`, `php7.4-3`, `php7.4` - PHP 7.4 +- Legacy versions v2 (amd64) - `php7.3-2.13`, `php7.3-2`, `php7.3` - PHP 7.3 - `php7.4-2.13`, `php7.4-2`, `php7.4` - PHP 7.4 - `php8.0-2.13`, `php8.0`, `php8.0` - PHP 8.0 diff --git a/tests/test.bats b/tests/test.bats index 527e2591..bcb66111 100755 --- a/tests/test.bats +++ b/tests/test.bats @@ -176,11 +176,6 @@ _healthcheck_wait () echo "$output" | grep "memory_limit => 128M => 128M" unset output - # Check Opcache Preload Enabled for 7.4 - run make exec -e CMD='php -i' - if [[ "${VERSION}" == "7.4" ]]; then echo "$output" | grep "opcache.preload"; fi - unset output - ### Cleanup ### make clean } @@ -242,7 +237,7 @@ _healthcheck_wait () unset output # Check Acquia CLI version - run docker exec -u docker "$NAME" bash -lc 'set -x; acli --version | grep "^Acquia CLI ${ACQUIA_CLI_VERSION}$"' + run docker exec -u docker "$NAME" bash -lc 'set -x; acli --version | grep "^Acquia CLI ${ACQUIA_CLI_VERSION}"' [[ ${status} == 0 ]] unset output