From 3a0f649a41bf3a75a8574c5b673a76b33e6b221d Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 24 Nov 2024 17:32:09 +0800 Subject: [PATCH] update soft version Signed-off-by: Kang Huaishuai --- .env.example | 4 +- .github/workflows/release.yaml | 68 +++++++-------- config/etc/docker/daemon.json | 5 +- config/etc/docker/daemon.production.json | 6 +- dockerfile/php/8.1/cli/Dockerfile | 1 + dockerfile/php/8.2/cli/Dockerfile | 1 + dockerfile/php/8.3/cli/Dockerfile | 1 + dockerfile/php/8.3/unit/Dockerfile | 4 +- dockerfile/php/nightly/cli/Dockerfile | 1 + dockerfile/php/nightly/fpm/Dockerfile | 1 + scripts/docker-compose.bump.yml | 6 +- windows/lnmp-windows-pm-repo/go/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/python/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/python/lwpm.yaml | 4 +- wsl/docker-compose.yml | 84 +++++++++---------- wsl/lnmp-wsl-builder-php | 14 +++- wsl/lnmp-wsl-install | 2 +- 17 files changed, 110 insertions(+), 100 deletions(-) diff --git a/.env.example b/.env.example index 22201d747..4ed8bb666 100644 --- a/.env.example +++ b/.env.example @@ -185,14 +185,16 @@ LNMP_DOCKER_IMAGE_PREFIX=khs1994 # LNMP_DOCKER_IMAGE_PREFIX=lrew # LNMP_DOCKER_IMAGE_PREFIX=ccr.ccs.tencentyun.com/your-company # LNMP_DOCKER_IMAGE_PREFIX=pcit-docker.pkg.coding.net/khs1994-docker/khs1994 +# LNMP_DOCKER_IMAGE_PREFIX=ghcr.io/khs1994 # [library 命名空间的 mirror] LNMP_LIBRARY_NS=library +# LNMP_LIBRARY_NS=hub.atomgit.com # LNMP_LIBRARY_NS=library-mirror # LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror # LNMP_LIBRARY_NS=pcit-docker.pkg.coding.net/khs1994-docker/library -# LNMP_LIBRARY_NS=hub.atomgit.com +# LNMP_LIBRARY_NS=ghcr.io/khs1994-docker # [其他镜像] diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index dce9de36f..2adef214a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,66 +13,66 @@ jobs: max-parallel: 3 matrix: include: - - JOB_NAME: wsl-php-builder-74 - DIST_FILE: khs1994-wsl-php74_7.4.33-debian-bullseye_amd64.deb - - JOB_NAME: wsl-php-builder-80 - DIST_FILE: khs1994-wsl-php80_8.0.30-debian-bullseye_amd64.deb + - JOB_NAME: wsl-php-builder-83 + DIST_FILE: khs1994-wsl-php83_8.3.12-debian-bullseye_amd64.deb + - JOB_NAME: wsl-php-builder-82 + DIST_FILE: khs1994-wsl-php82_8.2.26-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-81 DIST_FILE: khs1994-wsl-php81_8.1.31-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-nightly - DIST_FILE: khs1994-wsl-php83_0.0.0-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php85_0.0.0-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-debian12-81 DIST_FILE: khs1994-wsl-php81_8.1.31-debian-bookworm_amd64.deb - - JOB_NAME: wsl-php-builder-ubuntu1804-74 - DIST_FILE: khs1994-wsl-php74_7.4.33-ubuntu-bionic_amd64.deb - - JOB_NAME: wsl-php-builder-ubuntu1804-80 - DIST_FILE: khs1994-wsl-php80_8.0.30-ubuntu-bionic_amd64.deb + - JOB_NAME: wsl-php-builder-ubuntu1804-83 + DIST_FILE: khs1994-wsl-php83_8.3.12-ubuntu-bionic_amd64.deb + - JOB_NAME: wsl-php-builder-ubuntu1804-82 + DIST_FILE: khs1994-wsl-php82_8.2.26-ubuntu-bionic_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu1804-81 DIST_FILE: khs1994-wsl-php81_8.1.31-ubuntu-bionic_amd64.deb - - JOB_NAME: wsl-php-builder-ubuntu2004-74 - DIST_FILE: khs1994-wsl-php74_7.4.33-ubuntu-focal_amd64.deb - - JOB_NAME: wsl-php-builder-ubuntu2004-80 - DIST_FILE: khs1994-wsl-php80_8.0.30-ubuntu-focal_amd64.deb + - JOB_NAME: wsl-php-builder-ubuntu2004-83 + DIST_FILE: khs1994-wsl-php83_8.3.12-ubuntu-focal_amd64.deb + - JOB_NAME: wsl-php-builder-ubuntu2004-82 + DIST_FILE: khs1994-wsl-php82_8.2.26-ubuntu-focal_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2004-81 DIST_FILE: khs1994-wsl-php81_8.1.31-ubuntu-focal_amd64.deb - - JOB_NAME: wsl-php-builder-ubuntu2204-74 - DIST_FILE: khs1994-wsl-php74_7.4.33-ubuntu-jammy_amd64.deb - - JOB_NAME: wsl-php-builder-ubuntu2204-80 - DIST_FILE: khs1994-wsl-php80_8.0.30-ubuntu-jammy_amd64.deb + - JOB_NAME: wsl-php-builder-ubuntu2204-83 + DIST_FILE: khs1994-wsl-php83_8.3.12-ubuntu-jammy_amd64.deb + - JOB_NAME: wsl-php-builder-ubuntu2204-82 + DIST_FILE: khs1994-wsl-php82_8.2.26-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-81 DIST_FILE: khs1994-wsl-php81_8.1.31-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-nightly - DIST_FILE: khs1994-wsl-php83_0.0.0-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php85_0.0.0-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2210-81 DIST_FILE: khs1994-wsl-php81_8.1.31-ubuntu-kinetic_amd64.deb - - JOB_NAME: wsl-php-builder-rhel7-74 - DIST_FILE: khs1994-wsl-php74-7.4.33-1.el7.centos.x86_64.rpm - - JOB_NAME: wsl-php-builder-rhel8-74 - DIST_FILE: khs1994-wsl-php74-7.4.33-1.el8.centos.x86_64.rpm - - JOB_NAME: wsl-php-builder-rhel8-80 - DIST_FILE: khs1994-wsl-php80-8.0.30-1.el8.centos.x86_64.rpm + - JOB_NAME: wsl-php-builder-rhel7-83 + DIST_FILE: khs1994-wsl-php83-8.3.12-1.el7.centos.x86_64.rpm + - JOB_NAME: wsl-php-builder-rhel8-83 + DIST_FILE: khs1994-wsl-php83-8.3.12-1.el8.centos.x86_64.rpm + - JOB_NAME: wsl-php-builder-rhel8-82 + DIST_FILE: khs1994-wsl-php82-8.2.26-1.el8.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel8-81 DIST_FILE: khs1994-wsl-php81-8.1.31-1.el8.centos.x86_64.rpm - - JOB_NAME: wsl-php-builder-rhel9-74 - DIST_FILE: khs1994-wsl-php74-7.4.33-1.el9.centos.x86_64.rpm - - JOB_NAME: wsl-php-builder-rhel9-80 - DIST_FILE: khs1994-wsl-php80-8.0.30-1.el9.centos.x86_64.rpm + - JOB_NAME: wsl-php-builder-rhel9-83 + DIST_FILE: khs1994-wsl-php83-8.3.12-1.el9.centos.x86_64.rpm + - JOB_NAME: wsl-php-builder-rhel9-82 + DIST_FILE: khs1994-wsl-php82-8.2.26-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel9-81 DIST_FILE: khs1994-wsl-php81-8.1.31-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky8-81 DIST_FILE: khs1994-wsl-php81-8.1.31-1.el8.rocky.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky9-81 DIST_FILE: khs1994-wsl-php81-8.1.31-1.el9.rocky.x86_64.rpm - - JOB_NAME: wsl-php-builder-fc36-74 - DIST_FILE: khs1994-wsl-php74-7.4.33-1.fc36.x86_64.rpm - - JOB_NAME: wsl-php-builder-fc36-80 - DIST_FILE: khs1994-wsl-php80-8.0.30-1.fc36.x86_64.rpm + - JOB_NAME: wsl-php-builder-fc36-83 + DIST_FILE: khs1994-wsl-php83-8.3.12-1.fc36.x86_64.rpm + - JOB_NAME: wsl-php-builder-fc36-82 + DIST_FILE: khs1994-wsl-php82-8.2.26-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-81 DIST_FILE: khs1994-wsl-php81-8.1.31-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-nightly - DIST_FILE: khs1994-wsl-php83-0.0.0-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php85-0.0.0-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc37-nightly - DIST_FILE: khs1994-wsl-php83-0.0.0-1.fc37.x86_64.rpm + DIST_FILE: khs1994-wsl-php85-0.0.0-1.fc37.x86_64.rpm runs-on: ubuntu-latest env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/config/etc/docker/daemon.json b/config/etc/docker/daemon.json index 6d08649cd..cea35be43 100644 --- a/config/etc/docker/daemon.json +++ b/config/etc/docker/daemon.json @@ -1,8 +1,7 @@ { "registry-mirrors": [ - "https://dockerproxy.com", - "https://hub-mirror.c.163.com", - "https://mirror.baidubce.com" + "https://hub.atomgit.com", + "https://dockerproxy.com" ], "insecure-registries":[ "gcr.io" diff --git a/config/etc/docker/daemon.production.json b/config/etc/docker/daemon.production.json index cf068f7e0..54365d4db 100644 --- a/config/etc/docker/daemon.production.json +++ b/config/etc/docker/daemon.production.json @@ -1,9 +1,7 @@ { "registry-mirrors": [ - "https://dockerproxy.com", - "https://hub-mirror.c.163.com", - "https://mirror.baidubce.com", - "https://docker.developer.khs1994.com" + "https://hub.atomgit.com", + "https://dockerproxy.com" ], "debug": true, "dns": [ diff --git a/dockerfile/php/8.1/cli/Dockerfile b/dockerfile/php/8.1/cli/Dockerfile index 10fd8dcbc..3b632efbd 100644 --- a/dockerfile/php/8.1/cli/Dockerfile +++ b/dockerfile/php/8.1/cli/Dockerfile @@ -206,6 +206,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ + PHP_UNAME='Linux - Docker' \ && docker-php-source extract \ && cd /usr/src/php \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ diff --git a/dockerfile/php/8.2/cli/Dockerfile b/dockerfile/php/8.2/cli/Dockerfile index b49938c71..7c94acc1b 100644 --- a/dockerfile/php/8.2/cli/Dockerfile +++ b/dockerfile/php/8.2/cli/Dockerfile @@ -205,6 +205,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ + PHP_UNAME='Linux - Docker' \ && docker-php-source extract \ && cd /usr/src/php \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ diff --git a/dockerfile/php/8.3/cli/Dockerfile b/dockerfile/php/8.3/cli/Dockerfile index 3680bd146..9d3c4f31e 100644 --- a/dockerfile/php/8.3/cli/Dockerfile +++ b/dockerfile/php/8.3/cli/Dockerfile @@ -205,6 +205,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ + PHP_UNAME='Linux - Docker' \ && docker-php-source extract \ && cd /usr/src/php \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ diff --git a/dockerfile/php/8.3/unit/Dockerfile b/dockerfile/php/8.3/unit/Dockerfile index a635399fc..eaae0259e 100644 --- a/dockerfile/php/8.3/unit/Dockerfile +++ b/dockerfile/php/8.3/unit/Dockerfile @@ -7,8 +7,8 @@ FROM --platform=$TARGETPLATFORM ${USERNAME}/php:${PHP_VERSION}-${BASE}-alpine LABEL maintainer="khs1994-docker/lnmp " -# ENV NGINX_UNIT_VERSION=1.33.0 -ENV NGINX_UNIT_VERSION=master +ENV NGINX_UNIT_VERSION=1.33.0 +# ENV NGINX_UNIT_VERSION=master RUN set -x \ && mkdir -p /usr/src/unit \ diff --git a/dockerfile/php/nightly/cli/Dockerfile b/dockerfile/php/nightly/cli/Dockerfile index 61060e4e4..46a736ecc 100644 --- a/dockerfile/php/nightly/cli/Dockerfile +++ b/dockerfile/php/nightly/cli/Dockerfile @@ -239,6 +239,7 @@ RUN --mount=type=bind,from=php:alpine,source=/usr/local/bin,target=/opt/bin,rw \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ + PHP_UNAME='Linux - Docker' \ ARGON2_LIBS="-largon2" \ ARGON2_CFLAGS="-I/usr/include" \ # && docker-php-source extract \ diff --git a/dockerfile/php/nightly/fpm/Dockerfile b/dockerfile/php/nightly/fpm/Dockerfile index 600e9c93b..8f86e158e 100644 --- a/dockerfile/php/nightly/fpm/Dockerfile +++ b/dockerfile/php/nightly/fpm/Dockerfile @@ -224,6 +224,7 @@ RUN --mount=type=bind,from=php:fpm-alpine,source=/usr/local/bin,target=/opt/bin, CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ + PHP_UNAME='Linux - Docker' \ ARGON2_LIBS="-largon2" \ ARGON2_CFLAGS="-I/usr/include" \ # && docker-php-source extract \ diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index 0a6d5a5fa..da31e3334 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -48,13 +48,13 @@ services: image: node:20.5.1-alpine go: - image: golang:1.20.1-alpine + image: golang:1.23.3-alpine alpine: - image: alpine:3.16 + image: alpine:3.20 python: - image: python:3.11.1-alpine + image: python:3.13.0-alpine deno: image: denoland/deno:1.31.1 diff --git a/windows/lnmp-windows-pm-repo/go/lwpm.json b/windows/lnmp-windows-pm-repo/go/lwpm.json index f27e02dd5..ea56ed971 100644 --- a/windows/lnmp-windows-pm-repo/go/lwpm.json +++ b/windows/lnmp-windows-pm-repo/go/lwpm.json @@ -1,8 +1,8 @@ { "name": "go", "description": "Go is an open source programming language that makes it easy to build simple, reliable, and efficient software", - "version": "1.20.1", - "pre-version": "1.20.1", + "version": "1.23.3", + "pre-version": "1.23.3", "homepage": "https://golang.google.cn/", "bug": "https://github.com/golang/go/issues", "github": "golang/go", diff --git a/windows/lnmp-windows-pm-repo/python/lwpm.json b/windows/lnmp-windows-pm-repo/python/lwpm.json index d69d83166..bda804afa 100644 --- a/windows/lnmp-windows-pm-repo/python/lwpm.json +++ b/windows/lnmp-windows-pm-repo/python/lwpm.json @@ -11,7 +11,7 @@ ], "pre-url": "https://www.python.org/ftp/python/${VERSION}/python-${VERSION}-${env:lwpm_architecture}.exe", "pre-url-mirror": "https://repo.huaweicloud.com/python/${VERSION}/python-${VERSION}-${env:lwpm_architecture}.exe", - "pre-version": "3.11.1", + "pre-version": "3.13.0", "releases": "https://www.python.org/downloads/", "scripts": { "install": [ @@ -23,5 +23,5 @@ }, "url": "https://www.python.org/ftp/python/${VERSION}/python-${VERSION}-${env:lwpm_architecture}.exe", "url-mirror": "https://repo.huaweicloud.com/python/${VERSION}/python-${VERSION}-${env:lwpm_architecture}.exe", - "version": "3.11.1" + "version": "3.13.0" } diff --git a/windows/lnmp-windows-pm-repo/python/lwpm.yaml b/windows/lnmp-windows-pm-repo/python/lwpm.yaml index 84fe27703..53fa201b4 100644 --- a/windows/lnmp-windows-pm-repo/python/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/python/lwpm.yaml @@ -1,7 +1,7 @@ name: "python" description: "Python is a programming language that lets you work quickly and integrate systems more effectively" -version: "3.11.1" -pre-version: "3.11.1" +version: "3.13.0" +pre-version: "3.13.0" homepage: "https://www.python.org/" bug: "" github: "python/cpython" diff --git a/wsl/docker-compose.yml b/wsl/docker-compose.yml index 681b9f635..087e55bfa 100755 --- a/wsl/docker-compose.yml +++ b/wsl/docker-compose.yml @@ -6,27 +6,27 @@ services: # https://endoflife.software/operating-systems/linux/debian # https://github.com/docker-library/docs/tree/master/debian - wsl-php-builder-74: + wsl-php-builder-83: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_74:-7.4.33} + - PHP_VERSION=${PHP_VERSION_83:-8.3.12} - OS_TYPE=debian:bullseye-slim # - DEB_URL=mirrors.ustc.edu.cn # - DEB_SECURITY_URL=mirrors.ustc.edu.cn/debian-security - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php74_${PHP_VERSION_74:-7.4.33}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_${PHP_VERSION_83:-8.3.12}-debian-bullseye_amd64 - wsl-php-builder-80: + wsl-php-builder-82: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.30} + - PHP_VERSION=${PHP_VERSION_82:-8.2.26} - OS_TYPE=debian:bullseye-slim # - DEB_URL=mirrors.ustc.edu.cn # - DEB_SECURITY_URL=mirrors.ustc.edu.cn/debian-security - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php82_${PHP_VERSION_82:-8.2.26}-debian-bullseye_amd64 wsl-php-builder-81: build: @@ -48,7 +48,7 @@ services: - OS_TYPE=debian:bullseye-slim # - DEB_URL=mirrors.ustc.edu.cn # - DEB_SECURITY_URL=mirrors.ustc.edu.cn/debian-security - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_0.0.0-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php85_0.0.0-debian-bullseye_amd64 # latest stable php and debian wsl-php-builder-debian12-81: @@ -69,22 +69,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_74:-7.4.33} + - PHP_VERSION=${PHP_VERSION_83:-8.3.12} - OS_TYPE=ubuntu:18.04 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php74_${PHP_VERSION_74:-7.4.33}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_${PHP_VERSION_83:-8.3.12}-ubuntu-bionic_amd64 - wsl-php-builder-ubuntu1804-80: + wsl-php-builder-ubuntu1804-82: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.30} + - PHP_VERSION=${PHP_VERSION_82:-8.2.26} - OS_TYPE=ubuntu:18.04 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php82_${PHP_VERSION_82:-8.2.26}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu1804-81: build: @@ -102,22 +102,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_74:-7.4.33} + - PHP_VERSION=${PHP_VERSION_83:-8.3.12} - OS_TYPE=ubuntu:20.04 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php74_${PHP_VERSION_74:-7.4.33}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_${PHP_VERSION_83:-8.3.12}-ubuntu-focal_amd64 - wsl-php-builder-ubuntu2004-80: + wsl-php-builder-ubuntu2004-82: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.30} + - PHP_VERSION=${PHP_VERSION_82:-8.2.26} - OS_TYPE=ubuntu:20.04 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php82_${PHP_VERSION_82:-8.2.26}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2004-81: build: @@ -135,22 +135,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_74:-7.4.33} + - PHP_VERSION=${PHP_VERSION_83:-8.3.12} - OS_TYPE=ubuntu:22.04 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php74_${PHP_VERSION_74:-7.4.33}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_${PHP_VERSION_83:-8.3.12}-ubuntu-jammy_amd64 - wsl-php-builder-ubuntu2204-80: + wsl-php-builder-ubuntu2204-82: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.30} + - PHP_VERSION=${PHP_VERSION_82:-8.2.26} - OS_TYPE=ubuntu:22.04 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php82_${PHP_VERSION_82:-8.2.26}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-81: build: @@ -172,7 +172,7 @@ services: - OS_TYPE=ubuntu:22.04 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_0.0.0-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php85_0.0.0-ubuntu-jammy_amd64 # latest stable php and ubuntu wsl-php-builder-ubuntu2210-81: @@ -193,26 +193,26 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_74:-7.4.33} - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php74_${PHP_VERSION_74:-7.4.33}-centos-7_amd64 + - PHP_VERSION=${PHP_VERSION_83:-8.3.12} + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_${PHP_VERSION_83:-8.3.12}-centos-7_amd64 wsl-php-builder-rhel8-74: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_74:-7.4.33} + - PHP_VERSION=${PHP_VERSION_83:-8.3.12} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php74_${PHP_VERSION_74:-7.4.33}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_${PHP_VERSION_83:-8.3.12}-centos-8_amd64 - wsl-php-builder-rhel8-80: + wsl-php-builder-rhel8-82: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.30} + - PHP_VERSION=${PHP_VERSION_82:-8.2.26} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php82_${PHP_VERSION_82:-8.2.26}-centos-8_amd64 wsl-php-builder-rhel8-81: build: @@ -228,18 +228,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_74:-7.4.33} + - PHP_VERSION=${PHP_VERSION_83:-8.3.12} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php74_${PHP_VERSION_74:-7.4.33}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_${PHP_VERSION_83:-8.3.12}-centos-9_amd64 - wsl-php-builder-rhel9-80: + wsl-php-builder-rhel9-82: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.30} + - PHP_VERSION=${PHP_VERSION_82:-8.2.26} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php82_${PHP_VERSION_82:-8.2.26}-centos-9_amd64 wsl-php-builder-rhel9-81: build: @@ -278,18 +278,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_74:-7.4.33} + - PHP_VERSION=${PHP_VERSION_83:-8.3.12} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php74_${PHP_VERSION_74:-7.4.33}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_${PHP_VERSION_83:-8.3.12}-fedora-36_amd64 - wsl-php-builder-fc36-80: + wsl-php-builder-fc36-82: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.30} + - PHP_VERSION=${PHP_VERSION_82:-8.2.26} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php82_${PHP_VERSION_82:-8.2.26}-fedora-36_amd64 wsl-php-builder-fc36-81: build: @@ -307,7 +307,7 @@ services: args: - PHP_VERSION=nightly - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_0.0.0-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php85_0.0.0-fedora-36_amd64 # latest php and fedora wsl-php-builder-fc37-nightly: @@ -317,4 +317,4 @@ services: args: - PHP_VERSION=nightly - OS_TYPE=fedora:37 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php83_0.0.0-fedora-37_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php85_0.0.0-fedora-37_amd64 diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index 2ca5abf85..6719cea65 100755 --- a/wsl/lnmp-wsl-builder-php +++ b/wsl/lnmp-wsl-builder-php @@ -134,8 +134,12 @@ case "$1" in 8.2.* ) export PHP_NUM=82 - export BUILD_FROM_GIT=1 - export PHP_SRC_BRANCH=PHP-8.2 + ;; + + 8.3.* ) + export PHP_NUM=83 + # export BUILD_FROM_GIT=1 + # export PHP_SRC_BRANCH=PHP-8.2 ;; nightly ) @@ -144,7 +148,7 @@ case "$1" in ;; * ) - echo "ONLY SUPPORT 5.6 7.0 7.1 7.2 7.3[EOL] 7.4 8.0 8.1 nightly" + echo "ONLY SUPPORT 5.6 7.0 7.1 7.2 7.3 7.4[EOL] 8.0 8.1 8.2 8.3 nightly" exit 1 esac } @@ -312,6 +316,7 @@ libkrb5-3 \ libxpm4 \ $( $(_sudo) apt install -y libwebp5 > /dev/null 2>&1 && echo libwebp5 ) \ $( $(_sudo) apt install -y libwebp6 > /dev/null 2>&1 && echo libwebp6 ) \ +$( $(_sudo) apt install -y libwebp7 > /dev/null 2>&1 && echo libwebp7 ) \ $( _test_pkg libenchant1c2a ) \ $( _test_pkg libenchant-2-2 ) \ $( $(_sudo) apt install -y libssl1.1 > /dev/null 2>&1 && echo libssl1.1 ) \ @@ -1135,6 +1140,8 @@ fi $(_sudo) apt install -y curl +if [ "$1" = 'apt-dev' ];then _install_php_build_dep ; exit $? ; fi + command -v /usr/local/bin/pickle > /dev/null || _pickle command -v /usr/local/bin/composer > /dev/null || _composer @@ -1153,7 +1160,6 @@ fi _install_php_run_dep if [ "$1" = 'apt' ];then exit 0;fi -if [ "$1" = 'apt-dev' ];then _install_php_build_dep ; exit $? ; fi _install_php_build_dep diff --git a/wsl/lnmp-wsl-install b/wsl/lnmp-wsl-install index 78ec918cc..4d7410a4f 100755 --- a/wsl/lnmp-wsl-install +++ b/wsl/lnmp-wsl-install @@ -57,7 +57,7 @@ PG_MAJOR=10 GO_PREFIX=/usr/local -GO_VERSION=1.20.1 +GO_VERSION=1.23.3 NODE_VERSION=20.5.1