diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 76d963d..ebbf8c7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,5 +1,4 @@ name: Docker - on: pull_request: push: @@ -12,11 +11,14 @@ jobs: strategy: matrix: include: - - php: 81 + - alpine: '3.19' + php: 81 without-watchr: 1 - - php: 82 + - alpine: '3.20' + php: 82 without-watchr: '' - - php: 83 + - alpine: '3.20' + php: 83 without-watchr: '' steps: - @@ -41,6 +43,7 @@ jobs: context: . load: true build-args: | + ALPINE=${{ matrix.alpine }} PHP=${{ matrix.php }} WITHOUT_WATCHR=${{ matrix.without-watchr }} tags: opencodeco/phpctl:php${{ matrix.php }} @@ -58,5 +61,7 @@ jobs: with: context: . push: true - build-args: PHP=${{ matrix.php }} + build-args: | + ALPINE=${{ matrix.alpine }} + PHP=${{ matrix.php }} tags: opencodeco/phpctl:php${{ matrix.php }} diff --git a/Dockerfile b/Dockerfile index e0a6428..8f3ca09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG ALPINE=3.19 -FROM alpine:${ALPINE} +ARG ALPINE=3.20 +FROM alpine:$ALPINE ARG PHP ENV PHP_VERSION=$PHP diff --git a/rootfs/etc/apk/repositories b/rootfs/etc/apk/repositories deleted file mode 100644 index f1fb265..0000000 --- a/rootfs/etc/apk/repositories +++ /dev/null @@ -1,4 +0,0 @@ -https://dl-cdn.alpinelinux.org/alpine/latest-stable/main -https://dl-cdn.alpinelinux.org/alpine/latest-stable/community -https://dl-cdn.alpinelinux.org/alpine/edge/main -https://dl-cdn.alpinelinux.org/alpine/edge/community diff --git a/rootfs/usr/local/bin/install-swoole b/rootfs/usr/local/bin/install-swoole index 23db7ac..3017b47 100755 --- a/rootfs/usr/local/bin/install-swoole +++ b/rootfs/usr/local/bin/install-swoole @@ -1,7 +1,7 @@ #!/usr/bin/env sh set -e -SWOOLE_VERSION="5.1.2" +SWOOLE_VERSION="5.1.4" echo "Installing Swoole $SWOOLE_VERSION" # Download diff --git a/src-devc/.devcontainer/Dockerfile b/src-devc/.devcontainer/Dockerfile index c9bb6e8..2b3012f 100644 --- a/src-devc/.devcontainer/Dockerfile +++ b/src-devc/.devcontainer/Dockerfile @@ -5,7 +5,7 @@ ENV PHP_VERSION $PHP_VERSION COPY rootfs / ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install --no-install-recommends libcurl4-openssl-dev libc-ares-dev libsqlite3-dev libpq-dev git parallel unzip wget \ + && apt-get -y install --no-install-recommends libcurl4-openssl-dev libc-ares-dev libsqlite3-dev libpq-dev git parallel unzip wget libbrotli-dev \ && mv /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini \ && mv /etc/php/php.ini /usr/local/etc/php/conf.d/zzphp.ini \ && install-php-extensions sockets && install-swoole && install-tools