From d77e9c9588ebd1908678ceada29f8b57043f6f8b Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 25 Nov 2024 15:50:20 +0100 Subject: [PATCH 1/5] feat: try previous minor build definition --- bin/builder.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/builder.sh b/bin/builder.sh index 0e138d3..04b45e3 100755 --- a/bin/builder.sh +++ b/bin/builder.sh @@ -29,17 +29,20 @@ function check_semver () { } if [[ ! -f "/usr/local/share/php-build/definitions/${VERSION}" ]]; then - echo "Missing build definition for ${VERSION}. Trying to find older patch build definition" + echo "Missing build definition for ${VERSION}. Trying to find older build definition." check_semver "${VERSION}" if [[ ! "${MAJOR}" || ! "${MINOR}" || ! "${PATCH}" ]]; then echo Invalid version: "${TOOL_VERSION}" >&2 exit 1 fi - oldVersion=$(find /usr/local/share/php-build/definitions -type f -name "${MAJOR}.${MINOR}.*" -printf '%f\n' | sort --version-sort -r | head -n 1) + oldVersion=$(find /usr/local/share/php-build/definitions -type f -name "${MAJOR}.${MINOR}.*" -printf '%f\n' | sort --version-sort -r | head -n 1) if [[ -z $oldVersion ]]; then - echo "No usable definition found" >&2 - exit 1 + oldVersion=$(find /usr/local/share/php-build/definitions -type f -name "${MAJOR}.$((MINOR-1)).*" -printf '%f\n' | sort --version-sort -r | head -n 1) + if [[ -z $oldVersion ]]; then + echo "No usable definition found" >&2 + exit 1 + fi fi echo "Using $oldVersion" From 75c088acfc53461d36d18b46cffa434d8c7c2d36 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 25 Nov 2024 16:01:43 +0100 Subject: [PATCH 2/5] fix: optimize builder --- bin/builder.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/builder.sh b/bin/builder.sh index 04b45e3..33cc1ff 100755 --- a/bin/builder.sh +++ b/bin/builder.sh @@ -49,23 +49,31 @@ if [[ ! -f "/usr/local/share/php-build/definitions/${VERSION}" ]]; then cp "/usr/local/share/php-build/definitions/$oldVersion" "/usr/local/share/php-build/definitions/${VERSION}" sed -i "s/php-${oldVersion}/php-${VERSION}/" "/usr/local/share/php-build/definitions/${VERSION}" - cat "/usr/local/share/php-build/definitions/${VERSION}" fi # disable xdebug sed 's/install_xdebug/#install_xdebug/' -i "/usr/local/share/php-build/definitions/${VERSION}" +echo ----------------------------------------------------- +echo "Using definition /usr/local/share/php-build/definitions/${VERSION}" +echo ----------------------------------------------------- +cat "/usr/local/share/php-build/definitions/${VERSION}" +echo ----------------------------------------------------- + # https://github.com/php-build/php-build/blob/6530e7501ccc758928d5510813dc3f5fbdc87419/man/php-build.1.ronn#environment # https://github.com/php-build/php-build/issues/564 export PHP_BUILD_CONFIGURE_OPTS="--disable-intl --disable-cgi --disable-fpm --disable-phpdbg --disable-shared --enable-static" PHP_BUILD_XDEBUG_ENABLE=off echo "Building ${NAME} ${VERSION} for ${CODENAME}" +echo ----------------------------------------------------- php-build ${BUILD_ARGS} "${VERSION}" "/usr/local/${NAME}/${VERSION}" +echo ----------------------------------------------------- "/usr/local/${NAME}/${VERSION}/bin/php" --version file "/usr/local/${NAME}/${VERSION}/bin/php" #ldd "/usr/local/${NAME}/${VERSION}/bin/php" +echo ----------------------------------------------------- echo "Compressing ${NAME} ${VERSION} for ${CODENAME}-${ARCH}" tar -cJf "/cache/${NAME}-${VERSION}-${CODENAME}-${ARCH}.tar.xz" -C /usr/local/${NAME} "${VERSION}" From b8ea9df379180f2038ba50eb45df9052d54ce4d0 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 25 Nov 2024 16:01:55 +0100 Subject: [PATCH 3/5] chore: typo --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb611f6..4d83857 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ ARG DISTRO=focal #-------------------------------------- # base images #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04@sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b as build-focal -FROM ghcr.io/containerbase/ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 as build-jammy +FROM ghcr.io/containerbase/ubuntu:20.04@sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b AS build-focal +FROM ghcr.io/containerbase/ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 AS build-jammy #-------------------------------------- From 4ab23981a8911790d558d6073e50afd028ed169f Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 25 Nov 2024 16:02:08 +0100 Subject: [PATCH 4/5] chore: update renovate trigger --- renovate.Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/renovate.Dockerfile b/renovate.Dockerfile index 202bc8e..f933f2e 100644 --- a/renovate.Dockerfile +++ b/renovate.Dockerfile @@ -6,14 +6,18 @@ # makes lint happy FROM scratch -# EOL: 2024-11-25 +# EOL: 2025-12-31 # renovate: datasource=docker depName=php versioning=docker ENV PHP_VERSION=8.1.30 -# EOL: 2025-12-08 +# EOL: 2026-12-31 # renovate: datasource=docker depName=php versioning=docker ENV PHP_VERSION=8.2.25 -# EOL: 2026-11-23 +# EOL: 2027-12-31 # renovate: datasource=docker depName=php versioning=docker ENV PHP_VERSION=8.3.13 + +# EOL: 2028-12-31 +# renovate: datasource=docker depName=php versioning=docker +ENV PHP_VERSION=8.4.1 From 85fb866e8335a37fbf0272f01cd31968dca25f7f Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 25 Nov 2024 16:04:11 +0100 Subject: [PATCH 5/5] chore: typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4d83857..986b6cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ FROM ghcr.io/containerbase/ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a #-------------------------------------- # builder images #-------------------------------------- -FROM build-${DISTRO} as builder +FROM build-${DISTRO} AS builder ARG APT_PROXY