update soft version

Signed-off-by: Kang Huaishuai <[email protected]>
khs1994-docker · Nov 24, 2024 · 3a0f649 · 3a0f649
1 parent 98b3f8c
commit 3a0f649
Show file tree

Hide file tree

Showing 17 changed files with 110 additions and 100 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,8 +7,8 @@ FROM --platform=$TARGETPLATFORM ${USERNAME}/php:${PHP_VERSION}-${BASE}-alpine
 
 LABEL maintainer="khs1994-docker/lnmp <[email protected]>"
 
-# 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"