Skip to content

Commit f1570ec

Browse files
authored
Merge pull request #54 from WyriHaximusNet/windows-3.11
Add Windows 3.11
2 parents fb73237 + e39a275 commit f1570ec

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
strategy:
2828
matrix:
29-
alpine: ['3.10']
29+
alpine: ['3.10', '3.11']
3030
php: [7.2, 7.3, 7.4]
3131
type: [zts, nts]
3232
steps:
@@ -48,7 +48,7 @@ jobs:
4848
runs-on: ubuntu-latest
4949
strategy:
5050
matrix:
51-
alpine: ['3.10']
51+
alpine: ['3.10', '3.11']
5252
php: [7.2, 7.3, 7.4]
5353
type: [zts, nts]
5454
steps:
@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ubuntu-latest
7070
strategy:
7171
matrix:
72-
alpine: ['3.10']
72+
alpine: ['3.10', '3.11']
7373
php: [7.2, 7.3, 7.4]
7474
type: [zts, nts]
7575
steps:
@@ -89,7 +89,7 @@ jobs:
8989
runs-on: ubuntu-latest
9090
strategy:
9191
matrix:
92-
alpine: ['3.10']
92+
alpine: ['3.10', '3.11']
9393
php: [7.2, 7.3, 7.4]
9494
type: [zts, nts]
9595
steps:

Dockerfile-nts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.4-cli-alpine3.10 AS build-uv
1+
FROM php:7.4-cli-alpine3.11 AS build-uv
22
RUN apk update && \
33
apk add --no-cache $PHPIZE_DEPS git libuv-dev && \
44
git clone https://github.com/bwoebi/php-uv uv
@@ -13,7 +13,7 @@ RUN git fetch \
1313
RUN sha256sum /uv.so
1414

1515
## Build ext-meminfo
16-
FROM php:7.4-cli-alpine3.10 AS build-meminfo
16+
FROM php:7.4-cli-alpine3.11 AS build-meminfo
1717
RUN apk update && \
1818
apk add --no-cache $PHPIZE_DEPS git libuv-dev && \
1919
git clone https://github.com/tony2001/php-meminfo.git && \
@@ -27,7 +27,7 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
2727
cp "$EXTENSION_DIR/meminfo.so" /meminfo.so
2828
RUN sha256sum /meminfo.so
2929

30-
FROM php:7.4-cli-alpine3.10 AS nts-root
30+
FROM php:7.4-cli-alpine3.11 AS nts-root
3131

3232
# Build-time metadata as defined at http://label-schema.org
3333
ARG BUILD_DATE

Dockerfile-zts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.4-zts-alpine3.10 AS build-parallel
1+
FROM php:7.4-zts-alpine3.11 AS build-parallel
22
RUN apk update && \
33
apk add --no-cache $PHPIZE_DEPS git
44
RUN git clone https://github.com/krakjoe/parallel
@@ -12,7 +12,7 @@ RUN git fetch \
1212
cp "$EXTENSION_DIR/parallel.so" /parallel.so
1313
RUN sha256sum /parallel.so
1414

15-
FROM php:7.4-zts-alpine3.10 AS build-uv
15+
FROM php:7.4-zts-alpine3.11 AS build-uv
1616
RUN apk update && \
1717
apk add --no-cache $PHPIZE_DEPS git libuv-dev && \
1818
git clone https://github.com/bwoebi/php-uv uv
@@ -27,7 +27,7 @@ RUN git fetch \
2727
RUN sha256sum /uv.so
2828

2929
## Build ext-meminfo
30-
FROM php:7.4-zts-alpine3.10 AS build-meminfo
30+
FROM php:7.4-zts-alpine3.11 AS build-meminfo
3131
RUN apk update && \
3232
apk add --no-cache $PHPIZE_DEPS git libuv-dev && \
3333
git clone https://github.com/tony2001/php-meminfo.git && \
@@ -41,7 +41,7 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
4141
cp "$EXTENSION_DIR/meminfo.so" /meminfo.so
4242
RUN sha256sum /meminfo.so
4343

44-
FROM php:7.4-zts-alpine3.10 AS zts-root
44+
FROM php:7.4-zts-alpine3.11 AS zts-root
4545

4646
# Build-time metadata as defined at http://label-schema.org
4747
ARG BUILD_DATE

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Github Actions](https://github.com/WyriHaximusNet/docker-php/workflows/Continuous%20Integration/badge.svg)](https://github.com/wyrihaximusnet/docker-php/actions)
44
[![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/)
55
[![Docker hub](https://img.shields.io/docker/pulls/wyrihaximusnet/php.svg?color=00a5c9&labelColor=03566a)](https://hub.docker.com/r/wyrihaximusnet/php/)
6-
[![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/)
6+
[![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/)
77

88
# Images
99

build-php.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ declare -r VERSION_ALPINE=$4
1313
# I could create a placeholder like php:x.y-image-alpinex.y in the Dockerfile itself,
1414
# but I think it wouldn't be a good experience if you try to build the image yourself
1515
# thus that's the way I opted to have dynamic base images
16-
declare -r IMAGE_ORIGINAL_TAG="7.[0-9]-${SRC_IMAGE}-alpine3.10"
16+
declare -r IMAGE_ORIGINAL_TAG="7.[0-9]-${SRC_IMAGE}-alpine3.11"
1717

1818
declare -r IMAGE_TAG="${VERSION_PHP}-${SRC_IMAGE}-alpine${VERSION_ALPINE}"
1919
declare -r WYRIHAXIMUSNET_TAG="wyrihaximusnet/php:${VERSION_PHP}-${DST_IMAGE}-alpine${VERSION_ALPINE}"

0 commit comments

Comments
 (0)