diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index baf1f7e5..f7b29e50 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Scan for secrets in repository - uses: aquasecurity/trivy-action@0.35.0 + uses: aquasecurity/trivy-action@v0.36.0 with: scan-type: 'fs' trivy-config: .trivy/trivy.yaml diff --git a/.github/workflows/trufflehog.yml b/.github/workflows/trufflehog.yml index c4be3c77..9f458ad3 100644 --- a/.github/workflows/trufflehog.yml +++ b/.github/workflows/trufflehog.yml @@ -24,7 +24,7 @@ jobs: - name: Secret Scanning id: trufflehog_scan - uses: trufflesecurity/trufflehog@v3.82.8 + uses: trufflesecurity/trufflehog@v3.97.4 with: path: ./ base: "${{ github.event.repository.default_branch }}" diff --git a/.github/workflows/tryvi-trufflehog-default-security-scan.yml b/.github/workflows/tryvi-trufflehog-default-security-scan.yml index 65ab7bae..4b3d247f 100644 --- a/.github/workflows/tryvi-trufflehog-default-security-scan.yml +++ b/.github/workflows/tryvi-trufflehog-default-security-scan.yml @@ -77,7 +77,7 @@ jobs: docker run --rm trufflesecurity/trufflehog:latest docker --image spryker/php:${{ matrix.tags }} --only-verified - name: Scan Docker image with Trivy - uses: aquasecurity/trivy-action@0.35.0 + uses: aquasecurity/trivy-action@v0.36.0 with: image-ref: "spryker/php:${{ matrix.tags }}" exit-code: '1' diff --git a/README.md b/README.md index 0a0353c6..4ff7bb13 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,14 @@ FROM spryker/php:8.2 RUN mv /usr/local/etc/php/disabled/tideways.ini /usr/local/etc/php/conf.d/90-tideways.ini ``` +### Enable XLSX (xlswriter) +`xlswriter` is built into every image but stays disabled by default. Enable it when the application reads or writes XLSX files. +```dockerfile +FROM spryker/php:8.2 + +RUN mv /usr/local/etc/php/disabled/xlswriter.ini /usr/local/etc/php/conf.d/90-xlswriter.ini +``` + ## PHP extensions ``` @@ -189,22 +197,24 @@ Disabled extensions [ ] pcov 1.0.12 [ ] tideways 5.42.0-d1af5cc [ ] xhprof 2.3.10 + [ ] xlswriter 3.0.0 INSTALLED PACKAGES, CHANNEL PECL.PHP.NET: ========================================= -PACKAGE VERSION STATE -amqp 2.2.0 stable -apcu 5.1.28 stable -excimer 1.2.6 stable -imagick 3.8.1 stable -pcov 1.0.12 stable -redis 6.3.0 stable -xdebug 3.5.3 stable -xhprof 2.3.10 stable +PACKAGE VERSION STATE +amqp 2.2.0 stable +apcu 5.1.28 stable +excimer 1.2.6 stable +imagick 3.8.1 stable +pcov 1.0.12 stable +redis 6.3.0 stable +xdebug 3.5.3 stable +xhprof 2.3.10 stable +xlswriter 3.0.0 stable Composer ==================== -Composer version 2.10.2 2026-07-01 11:24:45 +Composer version 2.10.3 2026-08-27 13:34:23 ``` ##### Run the following to get the report ```bash diff --git a/alpine/3.21/8.2/Dockerfile b/alpine/3.21/8.2/Dockerfile index fb23bcb4..32181053 100644 --- a/alpine/3.21/8.2/Dockerfile +++ b/alpine/3.21/8.2/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.2.29 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.21 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.21/8.3/Dockerfile b/alpine/3.21/8.3/Dockerfile index 3c0e7918..3ac1ef0d 100644 --- a/alpine/3.21/8.3/Dockerfile +++ b/alpine/3.21/8.3/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.3.28 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.21 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.48 ARG BLACKFIRE_PHP_VERSION=83 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.21/8.4/Dockerfile b/alpine/3.21/8.4/Dockerfile index d3e415d1..4b12a32a 100644 --- a/alpine/3.21/8.4/Dockerfile +++ b/alpine/3.21/8.4/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.4.15 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.21 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.48 ARG BLACKFIRE_PHP_VERSION=84 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.22/8.2/Dockerfile b/alpine/3.22/8.2/Dockerfile index fcc4a19f..e4359ca8 100644 --- a/alpine/3.22/8.2/Dockerfile +++ b/alpine/3.22/8.2/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.2.31 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.22 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.22/8.3/Dockerfile b/alpine/3.22/8.3/Dockerfile index e30ed77c..15fa1f50 100644 --- a/alpine/3.22/8.3/Dockerfile +++ b/alpine/3.22/8.3/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.3.31 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.22 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.48 ARG BLACKFIRE_PHP_VERSION=83 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.22/8.4/Dockerfile b/alpine/3.22/8.4/Dockerfile index 61e75579..9a192c0a 100644 --- a/alpine/3.22/8.4/Dockerfile +++ b/alpine/3.22/8.4/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.4.22 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.22 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.48 ARG BLACKFIRE_PHP_VERSION=84 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.23/8.2/Dockerfile b/alpine/3.23/8.2/Dockerfile index fd195ab3..8486b5bc 100644 --- a/alpine/3.23/8.2/Dockerfile +++ b/alpine/3.23/8.2/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.2.33 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.23 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.23/8.3/Dockerfile b/alpine/3.23/8.3/Dockerfile index ca77d0c8..fd3730c4 100644 --- a/alpine/3.23/8.3/Dockerfile +++ b/alpine/3.23/8.3/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.3.33 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.23 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.48 ARG BLACKFIRE_PHP_VERSION=83 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.23/8.4/Dockerfile b/alpine/3.23/8.4/Dockerfile index 2b7b886f..6d00f661 100644 --- a/alpine/3.23/8.4/Dockerfile +++ b/alpine/3.23/8.4/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.4.25 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.23 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.48 ARG BLACKFIRE_PHP_VERSION=84 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.24/8.2/Dockerfile b/alpine/3.24/8.2/Dockerfile index bd0734b4..32f88d3b 100644 --- a/alpine/3.24/8.2/Dockerfile +++ b/alpine/3.24/8.2/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.2.33 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.24 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.24/8.3/Dockerfile b/alpine/3.24/8.3/Dockerfile index c454a990..96f2435c 100644 --- a/alpine/3.24/8.3/Dockerfile +++ b/alpine/3.24/8.3/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.3.33 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.24 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.48 ARG BLACKFIRE_PHP_VERSION=83 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.24/8.4/Dockerfile b/alpine/3.24/8.4/Dockerfile index 665b921f..afc62e71 100644 --- a/alpine/3.24/8.4/Dockerfile +++ b/alpine/3.24/8.4/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.4.25 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.24 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.48 ARG BLACKFIRE_PHP_VERSION=84 ARG NEWRELIC_VERSION=12.10.0.39 @@ -75,7 +75,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.24/8.5/Dockerfile b/alpine/3.24/8.5/Dockerfile index faa34e9e..5740f5a6 100644 --- a/alpine/3.24/8.5/Dockerfile +++ b/alpine/3.24/8.5/Dockerfile @@ -3,7 +3,7 @@ ARG SPRYKER_PHP_VERSION=8.5.10 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.24 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.53 ARG BLACKFIRE_PHP_VERSION=85 ARG NEWRELIC_VERSION=12.10.0.39 @@ -76,7 +76,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xhprof \ excimer \ amqp \ - imagick" + imagick \ + xlswriter" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/context/php/disabled/xlswriter.ini b/context/php/disabled/xlswriter.ini new file mode 100644 index 00000000..b95dd65b --- /dev/null +++ b/context/php/disabled/xlswriter.ini @@ -0,0 +1,2 @@ +[xlswriter] +extension = xlswriter.so diff --git a/debian/bookworm/8.2/Dockerfile b/debian/bookworm/8.2/Dockerfile index 45cd6aa8..d2d7f149 100644 --- a/debian/bookworm/8.2/Dockerfile +++ b/debian/bookworm/8.2/Dockerfile @@ -5,7 +5,7 @@ FROM php:${SPRYKER_PHP_VERSION}-fpm-bookworm SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 ARG NEWRELIC_VERSION=12.10.0.39 @@ -80,7 +80,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ grpc \ protobuf \ opentelemetry \ - imagick" + imagick \ + xlswriter" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \ diff --git a/debian/bookworm/8.3/Dockerfile b/debian/bookworm/8.3/Dockerfile index e529b0a6..164cfa54 100644 --- a/debian/bookworm/8.3/Dockerfile +++ b/debian/bookworm/8.3/Dockerfile @@ -5,7 +5,7 @@ FROM php:${SPRYKER_PHP_VERSION}-fpm-bookworm SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.48 ARG BLACKFIRE_PHP_VERSION=83 ARG NEWRELIC_VERSION=12.10.0.39 @@ -80,7 +80,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ grpc \ protobuf \ opentelemetry \ - imagick" + imagick \ + xlswriter" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \ diff --git a/debian/bookworm/8.4/Dockerfile b/debian/bookworm/8.4/Dockerfile index 092eaf01..878ab25d 100644 --- a/debian/bookworm/8.4/Dockerfile +++ b/debian/bookworm/8.4/Dockerfile @@ -5,7 +5,7 @@ FROM php:${SPRYKER_PHP_VERSION}-fpm-bookworm SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.48 ARG BLACKFIRE_PHP_VERSION=84 ARG NEWRELIC_VERSION=12.10.0.39 @@ -81,7 +81,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ grpc \ protobuf \ opentelemetry \ - imagick" + imagick \ + xlswriter" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \ diff --git a/debian/bookworm/8.5/Dockerfile b/debian/bookworm/8.5/Dockerfile index 05c99e16..828baa9f 100644 --- a/debian/bookworm/8.5/Dockerfile +++ b/debian/bookworm/8.5/Dockerfile @@ -5,7 +5,7 @@ FROM php:${SPRYKER_PHP_VERSION}-fpm-bookworm SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.10.2 +ARG COMPOSER_VERSION=2.10.3 ARG BLACKFIRE_VERSION=1.92.53 ARG BLACKFIRE_PHP_VERSION=85 ARG NEWRELIC_VERSION=12.10.0.39 @@ -82,7 +82,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ grpc \ protobuf \ opentelemetry \ - imagick" + imagick \ + xlswriter" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \