Skip to content

Commit

Permalink
Merge pull request #75 from theohbrothers/enhancement/bump-php-8.1-va…
Browse files Browse the repository at this point in the history
…riants-to-8.1.29

Enhancement: Bump php 8.1 variants to 8.1.29
  • Loading branch information
theohbrothersbot authored Jun 7, 2024
2 parents be8dd4a + 562b2cb commit 0b5c116
Show file tree
Hide file tree
Showing 6 changed files with 193 additions and 55 deletions.
102 changes: 51 additions & 51 deletions .github/workflows/ci-master-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ jobs:
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
build-8-1-28:
build-8-1-29:
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -571,9 +571,9 @@ jobs:
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-8.1.28-${{ github.sha }}
key: ${{ runner.os }}-buildx-8.1.29-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-8.1.28-
${{ runner.os }}-buildx-8.1.29-
${{ runner.os }}-buildx-
- name: Login to Docker Hub registry
Expand All @@ -586,7 +586,7 @@ jobs:

# This step generates the docker tags
- name: Prepare
id: prep-8-1-28-fpm-alpine
id: prep-8-1-29-fpm-alpine
run: |
set -e
Expand All @@ -599,7 +599,7 @@ jobs:
# Generate docker image tags
# E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
# E.g. 'master-<variant>' and 'master-abc0123-<variant>'
VARIANT="8.1.28-fpm-alpine"
VARIANT="8.1.29-fpm-alpine"
REF_VARIANT="${REF}-${VARIANT}"
REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
Expand All @@ -609,51 +609,51 @@ jobs:
echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
- name: 8.1.28-fpm-alpine - Build (PRs)
- name: 8.1.29-fpm-alpine - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v5
with:
context: variants/8.1.28-fpm-alpine
context: variants/8.1.29-fpm-alpine
platforms:
push: false
tags: |
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine.outputs.REF_SHA_VARIANT }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

- name: 8.1.28-fpm-alpine - Build and push (master)
- name: 8.1.29-fpm-alpine - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v5
with:
context: variants/8.1.28-fpm-alpine
context: variants/8.1.29-fpm-alpine
platforms:
push: true
tags: |
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine.outputs.REF_SHA_VARIANT }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

- name: 8.1.28-fpm-alpine - Build and push (release)
- name: 8.1.29-fpm-alpine - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v5
with:
context: variants/8.1.28-fpm-alpine
context: variants/8.1.29-fpm-alpine
platforms:
push: true
tags: |
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine.outputs.VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine.outputs.VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine.outputs.REF_SHA_VARIANT }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

# This step generates the docker tags
- name: Prepare
id: prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets
id: prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets
run: |
set -e
Expand All @@ -666,7 +666,7 @@ jobs:
# Generate docker image tags
# E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
# E.g. 'master-<variant>' and 'master-abc0123-<variant>'
VARIANT="8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets"
VARIANT="8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets"
REF_VARIANT="${REF}-${VARIANT}"
REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
Expand All @@ -676,51 +676,51 @@ jobs:
echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
- name: 8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets - Build (PRs)
- name: 8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v5
with:
context: variants/8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets
context: variants/8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets
platforms:
push: false
tags: |
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_SHA_VARIANT }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

- name: 8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets - Build and push (master)
- name: 8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v5
with:
context: variants/8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets
context: variants/8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets
platforms:
push: true
tags: |
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_SHA_VARIANT }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

- name: 8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets - Build and push (release)
- name: 8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v5
with:
context: variants/8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets
context: variants/8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets
platforms:
push: true
tags: |
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets.outputs.REF_SHA_VARIANT }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

# This step generates the docker tags
- name: Prepare
id: prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug
id: prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug
run: |
set -e
Expand All @@ -733,7 +733,7 @@ jobs:
# Generate docker image tags
# E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
# E.g. 'master-<variant>' and 'master-abc0123-<variant>'
VARIANT="8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug"
VARIANT="8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug"
REF_VARIANT="${REF}-${VARIANT}"
REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
Expand All @@ -743,45 +743,45 @@ jobs:
echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
- name: 8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug - Build (PRs)
- name: 8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v5
with:
context: variants/8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug
context: variants/8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug
platforms:
push: false
tags: |
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_SHA_VARIANT }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

- name: 8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug - Build and push (master)
- name: 8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v5
with:
context: variants/8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug
context: variants/8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug
platforms:
push: true
tags: |
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_SHA_VARIANT }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

- name: 8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug - Build and push (release)
- name: 8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v5
with:
context: variants/8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug
context: variants/8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug
platforms:
push: true
tags: |
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_SHA_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_VARIANT }}
${{ github.repository }}:${{ steps.prep-8-1-29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug.outputs.REF_SHA_VARIANT }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

Expand Down Expand Up @@ -1809,7 +1809,7 @@ jobs:
needs:
- build-8-3-8
- build-8-2-20
- build-8-1-28
- build-8-1-29
- build-8-0-30
- build-7-4-33
- build-7-3-33
Expand All @@ -1829,7 +1829,7 @@ jobs:
needs:
- build-8-3-8
- build-8-2-20
- build-8-1-28
- build-8-1-29
- build-8-0-30
- build-7-4-33
- build-7-3-33
Expand All @@ -1851,7 +1851,7 @@ jobs:
needs:
- build-8-3-8
- build-8-2-20
- build-8-1-28
- build-8-1-29
- build-8-0-30
- build-7-4-33
- build-7-3-33
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ Dockerized php with php extension(s), based on [official php images](https://hub
| `:8.2.20-fpm-alpine` | [View](variants/8.2.20-fpm-alpine) |
| `:8.2.20-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets` | [View](variants/8.2.20-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets) |
| `:8.2.20-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug` | [View](variants/8.2.20-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug) |
| `:8.1.28-fpm-alpine` | [View](variants/8.1.28-fpm-alpine) |
| `:8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets` | [View](variants/8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets) |
| `:8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug` | [View](variants/8.1.28-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug) |
| `:8.1.29-fpm-alpine` | [View](variants/8.1.29-fpm-alpine) |
| `:8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets` | [View](variants/8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets) |
| `:8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug` | [View](variants/8.1.29-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug) |
| `:8.0.30-fpm-alpine` | [View](variants/8.0.30-fpm-alpine) |
| `:8.0.30-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets` | [View](variants/8.0.30-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets) |
| `:8.0.30-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug` | [View](variants/8.0.30-fpm-alpine-opcache-mysqli-gd-pdo-memcached-sockets-xdebug) |
Expand Down
2 changes: 1 addition & 1 deletion generate/definitions/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"versions": [
"8.3.8",
"8.2.20",
"8.1.28",
"8.1.29",
"8.0.30",
"7.4.33",
"7.3.33",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
FROM php:8.1.29-fpm-alpine

# opcache
RUN set -eux; \
docker-php-ext-install opcache

# mysqli (deprecated)
RUN set -eux; \
docker-php-ext-install mysqli

# gd
RUN set -eux; \
apk add --no-cache freetype libjpeg-turbo libpng; \
apk add --no-cache --virtual .deps freetype-dev libjpeg-turbo-dev libpng-dev; \
docker-php-ext-configure gd \
--with-freetype=/usr/include/ \
--with-jpeg=/usr/include/; \
docker-php-ext-install gd; \
docker-php-source delete; \
apk del .deps

# PDO: mysql driver
RUN set -eux; \
docker-php-ext-install pdo pdo_mysql

# PDO: pgsql driver
# See: https://github.com/docker-library/php/issues/221
RUN set -eux; \
apk add --no-cache postgresql-libs; \
apk add --no-cache --virtual .deps postgresql-dev; \
docker-php-ext-install pdo_pgsql; \
apk del .deps

# memcached
# See: https://stackoverflow.com/questions/40894385/how-can-i-install-the-php-memcached-extension-on-dockers-php7-alpine-image
RUN set -eux; \
apk add --no-cache libmemcached-libs zlib; \
apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS; \
apk add --no-cache --virtual .deps zlib-dev libmemcached-dev cyrus-sasl-dev; \
pecl install memcached; \
echo "extension=memcached.so" > /usr/local/etc/php/conf.d/20_memcached.ini; \
docker-php-source delete; \
apk del .deps; \
apk del .phpize-deps;

# Sockets
# See: https://github.com/docker-library/php/issues/181#issuecomment-173365852
RUN set -eux; \
apk add --no-cache --virtual .deps linux-headers; \
docker-php-ext-install sockets; \
apk del .deps

# Xdebug: https://stackoverflow.com/questions/46825502/how-do-i-install-xdebug-on-dockers-official-php-fpm-alpine-image
# PHPIZE_DEPS: autoconf dpkg-dev dpkg file g++ gcc libc-dev make pkgconf re2c
RUN set -eux; \
apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \
apk add --no-cache --virtual .deps linux-headers; \
pecl install xdebug-3.3.1; \
docker-php-ext-enable xdebug; \
docker-php-source delete; \
apk del .deps; \
apk del .build-dependencies
RUN set -eux; \
{ \
echo "[xdebug]"; \
echo "zend_extension=xdebug"; \
echo "xdebug.mode=debug"; \
echo "xdebug.start_with_request=yes"; \
echo "xdebug.client_host=host.docker.internal"; \
echo "xdebug.client_port=9000"; \
} > /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini;

RUN set -eux; \
echo; \
php -i; \
php -m
Loading

0 comments on commit 0b5c116

Please sign in to comment.