From 3caef2148c7955c70385bf840889df606059c330 Mon Sep 17 00:00:00 2001 From: dannc Date: Tue, 7 May 2024 11:52:54 +0700 Subject: [PATCH] bump versions, sync xdebug version for all images --- .env | 2 +- .github/workflows/continuous-integration.yml | 1 + Makefile | 14 +++++++------- readme.md | 16 +++++----------- v7.2/Dockerfile | 2 +- v7.3/Dockerfile | 2 +- v7.4/Dockerfile | 2 +- v8.0/Dockerfile | 2 +- v8.1/Dockerfile | 2 +- v8.2/Dockerfile | 4 ++-- v8.3/Dockerfile | 4 ++-- 11 files changed, 23 insertions(+), 28 deletions(-) diff --git a/.env b/.env index 69fd840..6fd211e 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -COMPOSER_VERSION=2.7.2 +COMPOSER_VERSION=2.7.6 diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6272532..93b0d64 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -43,6 +43,7 @@ jobs: --platform=linux/amd64,linux/arm64 \ --build-arg BUILDKIT_INLINE_CACHE=1 \ --build-arg COMPOSER_VERSION=${{ env.COMPOSER_VERSION }} \ + --build-arg XDEBUG_VERSION=${{ env.XDEBUG_VERSION }} \ --cache-from="type=registry,ref=dannecron/php-for-dev:${{ matrix.php_version }}.cache,mode=max" \ --cache-to="type=registry,ref=dannecron/php-for-dev:${{ matrix.php_version }}.cache,mode=max" \ --tag=dannecron/php-for-dev:${{ matrix.php_version }} \ diff --git a/Makefile b/Makefile index 165b0f0..3b87cae 100644 --- a/Makefile +++ b/Makefile @@ -2,22 +2,22 @@ include .env build-72: - cd ./v7.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:7.2 `pwd` + cd ./v7.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.2 `pwd` build-73: - cd ./v7.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:7.3 `pwd` + cd ./v7.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.3 `pwd` build-74: - cd ./v7.4 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:7.4 `pwd` + cd ./v7.4 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.4 `pwd` build-80: - cd ./v8.0 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:8.0 `pwd` + cd ./v8.0 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.0 `pwd` build-81: - cd ./v8.1 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:8.1 `pwd` + cd ./v8.1 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.1 `pwd` build-82: - cd ./v8.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:8.2 `pwd` + cd ./v8.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.2 `pwd` build-83: - cd ./v8.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:8.3 `pwd` + cd ./v8.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.3 `pwd` diff --git a/readme.md b/readme.md index 6fe8534..99bf2f5 100644 --- a/readme.md +++ b/readme.md @@ -6,29 +6,23 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan #### Supported versions -* php 8.3.4 - * xdebug 3.3.1 -* php 8.2.17 - * xdebug 3.3.1 -* php 8.1.27 - * xdebug 3.3.1 +* php 8.3.6 +* php 8.2.18 +* php 8.1.28 * php 8.0.30 **(latest)** - * xdebug 3.3.1 * php 7.4.33 - * xdebug 2.9.8 * rdkafka 6.0.3 * timecop 1.2.10 * php 7.3.33 - * xdebug 2.9.8 * rdkafka 6.0.3 * timecop 1.2.10 * php 7.2.34 - * xdebug 2.7.2 * rdkafka 6.0.3 * timecop 1.2.10 All images includes: -* composer 2.7.2 +* composer 2.7.6 +* xdebug 3.3.2 * [zsh](https://www.zsh.org/), that allowed using [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh) and its plugins for improving user experience. #### Build diff --git a/v7.2/Dockerfile b/v7.2/Dockerfile index e5eae87..d5d2f65 100644 --- a/v7.2/Dockerfile +++ b/v7.2/Dockerfile @@ -1,7 +1,7 @@ FROM php:7.2.34-alpine ARG COMPOSER_VERSION -ARG PHP_XDEBUG_VERSION=2.7.2 +ARG PHP_XDEBUG_VERSION ARG PHP_RDKAFKA_VERSION=6.0.3 ARG PHP_TIMECOP_VERSION=1.2.10 diff --git a/v7.3/Dockerfile b/v7.3/Dockerfile index 9f9c384..bc941a8 100644 --- a/v7.3/Dockerfile +++ b/v7.3/Dockerfile @@ -1,7 +1,7 @@ FROM php:7.3.33-alpine ARG COMPOSER_VERSION -ARG PHP_XDEBUG_VERSION=2.9.8 +ARG PHP_XDEBUG_VERSION ARG PHP_RDKAFKA_VERSION=6.0.3 ARG PHP_TIMECOP_VERSION=1.2.10 diff --git a/v7.4/Dockerfile b/v7.4/Dockerfile index 6919d73..d54bc0b 100644 --- a/v7.4/Dockerfile +++ b/v7.4/Dockerfile @@ -1,7 +1,7 @@ FROM php:7.4.33-alpine ARG COMPOSER_VERSION -ARG PHP_XDEBUG_VERSION=2.9.8 +ARG PHP_XDEBUG_VERSION ARG PHP_RDKAFKA_VERSION=6.0.3 ARG PHP_TIMECOP_VERSION=1.2.10 diff --git a/v8.0/Dockerfile b/v8.0/Dockerfile index bbb700b..f9f5612 100644 --- a/v8.0/Dockerfile +++ b/v8.0/Dockerfile @@ -1,7 +1,7 @@ FROM php:8.0.30-alpine ARG COMPOSER_VERSION -ARG PHP_XDEBUG_VERSION=3.3.1 +ARG PHP_XDEBUG_VERSION RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ diff --git a/v8.1/Dockerfile b/v8.1/Dockerfile index ebe6089..b6c139f 100644 --- a/v8.1/Dockerfile +++ b/v8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.27-alpine +FROM php:8.1.28-alpine ARG COMPOSER_VERSION ARG PHP_XDEBUG_VERSION=3.3.1 diff --git a/v8.2/Dockerfile b/v8.2/Dockerfile index e7d9fda..ff146ce 100644 --- a/v8.2/Dockerfile +++ b/v8.2/Dockerfile @@ -1,7 +1,7 @@ -FROM php:8.2.17-alpine +FROM php:8.2.18-alpine ARG COMPOSER_VERSION -ARG PHP_XDEBUG_VERSION=3.3.1 +ARG PHP_XDEBUG_VERSION RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ diff --git a/v8.3/Dockerfile b/v8.3/Dockerfile index 841bdac..3eea94b 100644 --- a/v8.3/Dockerfile +++ b/v8.3/Dockerfile @@ -1,7 +1,7 @@ -FROM php:8.3.4-alpine +FROM php:8.3.6-alpine ARG COMPOSER_VERSION -ARG PHP_XDEBUG_VERSION=3.3.1 +ARG PHP_XDEBUG_VERSION RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \