diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d901d548..ab515079 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - alpine: ['3.10'] + alpine: ['3.10', '3.11'] php: [7.2, 7.3, 7.4] type: [zts, nts] steps: @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - alpine: ['3.10'] + alpine: ['3.10', '3.11'] php: [7.2, 7.3, 7.4] type: [zts, nts] steps: @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - alpine: ['3.10'] + alpine: ['3.10', '3.11'] php: [7.2, 7.3, 7.4] type: [zts, nts] steps: @@ -89,7 +89,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - alpine: ['3.10'] + alpine: ['3.10', '3.11'] php: [7.2, 7.3, 7.4] type: [zts, nts] steps: diff --git a/Dockerfile-nts b/Dockerfile-nts index b6ce9ba5..867f2b97 100644 --- a/Dockerfile-nts +++ b/Dockerfile-nts @@ -1,4 +1,4 @@ -FROM php:7.4-cli-alpine3.10 AS build-uv +FROM php:7.4-cli-alpine3.11 AS build-uv RUN apk update && \ apk add --no-cache $PHPIZE_DEPS git libuv-dev && \ git clone https://github.com/bwoebi/php-uv uv @@ -13,7 +13,7 @@ RUN git fetch \ RUN sha256sum /uv.so ## Build ext-meminfo -FROM php:7.4-cli-alpine3.10 AS build-meminfo +FROM php:7.4-cli-alpine3.11 AS build-meminfo RUN apk update && \ apk add --no-cache $PHPIZE_DEPS git libuv-dev && \ git clone https://github.com/tony2001/php-meminfo.git && \ @@ -27,7 +27,7 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \ cp "$EXTENSION_DIR/meminfo.so" /meminfo.so RUN sha256sum /meminfo.so -FROM php:7.4-cli-alpine3.10 AS nts-root +FROM php:7.4-cli-alpine3.11 AS nts-root # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE diff --git a/Dockerfile-zts b/Dockerfile-zts index e89f3205..afca142b 100644 --- a/Dockerfile-zts +++ b/Dockerfile-zts @@ -1,4 +1,4 @@ -FROM php:7.4-zts-alpine3.10 AS build-parallel +FROM php:7.4-zts-alpine3.11 AS build-parallel RUN apk update && \ apk add --no-cache $PHPIZE_DEPS git RUN git clone https://github.com/krakjoe/parallel @@ -12,7 +12,7 @@ RUN git fetch \ cp "$EXTENSION_DIR/parallel.so" /parallel.so RUN sha256sum /parallel.so -FROM php:7.4-zts-alpine3.10 AS build-uv +FROM php:7.4-zts-alpine3.11 AS build-uv RUN apk update && \ apk add --no-cache $PHPIZE_DEPS git libuv-dev && \ git clone https://github.com/bwoebi/php-uv uv @@ -27,7 +27,7 @@ RUN git fetch \ RUN sha256sum /uv.so ## Build ext-meminfo -FROM php:7.4-zts-alpine3.10 AS build-meminfo +FROM php:7.4-zts-alpine3.11 AS build-meminfo RUN apk update && \ apk add --no-cache $PHPIZE_DEPS git libuv-dev && \ git clone https://github.com/tony2001/php-meminfo.git && \ @@ -41,7 +41,7 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \ cp "$EXTENSION_DIR/meminfo.so" /meminfo.so RUN sha256sum /meminfo.so -FROM php:7.4-zts-alpine3.10 AS zts-root +FROM php:7.4-zts-alpine3.11 AS zts-root # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE diff --git a/README.md b/README.md index 10d9a76b..a45eab6d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Github Actions](https://github.com/WyriHaximusNet/docker-php/workflows/Continuous%20Integration/badge.svg)](https://github.com/wyrihaximusnet/docker-php/actions) [![Docker hub](https://img.shields.io/badge/Docker%20Hub-00a5c9.svg?logo=docker&style=flat&color=00a5c9&labelColor=00a5c9&logoColor=white)](https://hub.docker.com/r/wyrihaximusnet/php/) [![Docker hub](https://img.shields.io/docker/pulls/wyrihaximusnet/php.svg?color=00a5c9&labelColor=03566a)](https://hub.docker.com/r/wyrihaximusnet/php/) -[![Docker hub](https://img.shields.io/microbadger/image-size/wyrihaximusnet/php/7.3-zts-alpine3.10.svg?color=00a5c9&labelColor=03566a)](https://hub.docker.com/r/wyrihaximusnet/php/) +[![Docker hub](https://img.shields.io/microbadger/image-size/wyrihaximusnet/php/7.4-zts-alpine3.11.svg?color=00a5c9&labelColor=03566a)](https://hub.docker.com/r/wyrihaximusnet/php/) # Images diff --git a/build-php.sh b/build-php.sh index a3ff6ab7..6d5d8113 100755 --- a/build-php.sh +++ b/build-php.sh @@ -13,7 +13,7 @@ declare -r VERSION_ALPINE=$4 # I could create a placeholder like php:x.y-image-alpinex.y in the Dockerfile itself, # but I think it wouldn't be a good experience if you try to build the image yourself # thus that's the way I opted to have dynamic base images -declare -r IMAGE_ORIGINAL_TAG="7.[0-9]-${SRC_IMAGE}-alpine3.10" +declare -r IMAGE_ORIGINAL_TAG="7.[0-9]-${SRC_IMAGE}-alpine3.11" declare -r IMAGE_TAG="${VERSION_PHP}-${SRC_IMAGE}-alpine${VERSION_ALPINE}" declare -r WYRIHAXIMUSNET_TAG="wyrihaximusnet/php:${VERSION_PHP}-${DST_IMAGE}-alpine${VERSION_ALPINE}"