From 1f0745862512096b297b6f532946e227da45c92f Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 14 May 2023 13:58:10 +0800 Subject: [PATCH 01/42] [MariaDB] Update to v10.11.3 Signed-off-by: Kang Huaishuai --- README.cn.md | 2 +- README.md | 2 +- bin/lnmp-mysql | 2 +- docker-production.yml | 4 ++-- dockerfile/sync/docker-image-sync.json | 4 ++-- kubernetes/lnmp/mariadb/overlays/development/patch.json | 2 +- lrew/mariadb/.env.compose | 2 +- lrew/mariadb/docker-compose.yml | 2 +- lrew/mariadb/example.Dockerfile | 2 +- scripts/docker-compose.bump.yml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.cn.md b/README.cn.md index f033a4bd3..ab53bc80a 100644 --- a/README.cn.md +++ b/README.cn.md @@ -205,7 +205,7 @@ $ ./lnmp-docker down |[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.3-unit-alpine`| **1.28.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| -|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.8.3` | **10.8.3** |`ubuntu:jammy` | +|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.3` | **10.11.3** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | |[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.3-fpm-alpine` | **8.2.3** |`alpine:3.16` | |[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.3-composer-alpine`| **2.5.5** |`alpine:3.16` | diff --git a/README.md b/README.md index 882ae6565..020d9d1f2 100644 --- a/README.md +++ b/README.md @@ -200,7 +200,7 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.3-unit-alpine`| **1.28.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| -|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.8.3` | **10.8.3** |`ubuntu:jammy` | +|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.3` | **10.11.3** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | |[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.3-fpm-alpine` | **8.2.3** |`alpine:3.16` | |[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.3-composer-alpine`| **2.5.5** |`alpine:3.16` | diff --git a/bin/lnmp-mysql b/bin/lnmp-mysql index bd5bcf0e5..2f90a6a68 100755 --- a/bin/lnmp-mysql +++ b/bin/lnmp-mysql @@ -20,7 +20,7 @@ if [ "$debug" = 'true' ];then set -x; fi image=mysql:${LNMP_MYSQL_VERSION:-8.0.33} if ! [ $(uname -s) = 'x86_64' ];then - image=mariadb:${LNMP_MARIADB_VERSION:-10.8.3} + image=mariadb:${LNMP_MARIADB_VERSION:-10.11.3} fi exec docker run -i ${tty} --rm \ diff --git a/docker-production.yml b/docker-production.yml index c4d6f3f4f..e238b91c0 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -159,9 +159,9 @@ services: # << : *default-build-debian # context: ./dockerfile/mariadb/ # dockerfile: Dockerfile - # image: "mariadb:10.8.3" + # image: "mariadb:10.11.3" # # image: username/lnmp-mariadb:tag - # # image: khs1994/lnmp-mariadb:10.8.3 + # # image: khs1994/lnmp-mariadb:10.11.3 # environment: # MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_root_password # MYSQL_DATABASE: test diff --git a/dockerfile/sync/docker-image-sync.json b/dockerfile/sync/docker-image-sync.json index 227b20543..c28c3cab8 100644 --- a/dockerfile/sync/docker-image-sync.json +++ b/dockerfile/sync/docker-image-sync.json @@ -84,8 +84,8 @@ "dest": "library-mirror/mariadb:latest" }, { - "source": "library/mariadb:10.8.3", - "dest": "library-mirror/mariadb:10.8.3" + "source": "library/mariadb:10.11.3", + "dest": "library-mirror/mariadb:10.11.3" }, { "source": "library/mariadb:10.7.4", diff --git a/kubernetes/lnmp/mariadb/overlays/development/patch.json b/kubernetes/lnmp/mariadb/overlays/development/patch.json index 0ab5196be..1967127a0 100644 --- a/kubernetes/lnmp/mariadb/overlays/development/patch.json +++ b/kubernetes/lnmp/mariadb/overlays/development/patch.json @@ -2,7 +2,7 @@ { "op": "replace", "path": "/spec/template/spec/containers/0/image", - "value": "mariadb:10.8.3" + "value": "mariadb:10.11.3" }, { "op": "remove", diff --git a/lrew/mariadb/.env.compose b/lrew/mariadb/.env.compose index bf248604f..c2590170e 100644 --- a/lrew/mariadb/.env.compose +++ b/lrew/mariadb/.env.compose @@ -1,5 +1,5 @@ # 请在 khs1994-docker/lnmp 的 .env 文件中(例如`~/lnmp/.env`)写入以下变量 -LNMP_MARIADB_VERSION=10.8.3 +LNMP_MARIADB_VERSION=10.11.3 # LNMP_MARIADB_DATA=/var/lib/mysql-my diff --git a/lrew/mariadb/docker-compose.yml b/lrew/mariadb/docker-compose.yml index c6f29e179..cfcb467bf 100644 --- a/lrew/mariadb/docker-compose.yml +++ b/lrew/mariadb/docker-compose.yml @@ -21,7 +21,7 @@ services: << : - *common - *common-label - image: "${LNMP_LIBRARY_NS:-library}/mariadb:${LNMP_MARIADB_VERSION:-10.8.3}" + image: "${LNMP_LIBRARY_NS:-library}/mariadb:${LNMP_MARIADB_VERSION:-10.11.3}" environment: # @link https://github.com/docker-library/docs/tree/master/mariadb#environment-variables MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_root_password diff --git a/lrew/mariadb/example.Dockerfile b/lrew/mariadb/example.Dockerfile index 59208f1f4..9a307990b 100644 --- a/lrew/mariadb/example.Dockerfile +++ b/lrew/mariadb/example.Dockerfile @@ -1,4 +1,4 @@ -FROM mariadb:10.8.3 +FROM mariadb:10.11.3 LABEL maintainer="khs1994-docker/lnmp " diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index 9baeca01d..206753961 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -5,7 +5,7 @@ services: image: mysql:8.0.33 mariadb: - image: mariadb:10.8.3 + image: mariadb:10.11.3 redis: image: redis:7.0.0-alpine From 412e5e9041c2065c0ed26e28bc38b6ee2226d6d6 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 20 May 2023 10:17:52 +0800 Subject: [PATCH 02/42] [Lwpm] Update soft Signed-off-by: Kang Huaishuai --- windows/lnmp-windows-pm-repo/7zip/lwpm.json | 3 +- windows/lnmp-windows-pm-repo/adb/lwpm.json | 3 +- .../chrome-beta/lwpm.json | 30 +++++++++++++++++++ .../chrome-canary/lwpm.json | 30 +++++++++++++++++++ .../lnmp-windows-pm-repo/chrome-dev/lwpm.json | 30 +++++++++++++++++++ windows/lnmp-windows-pm-repo/chrome/lwpm.json | 9 +++--- windows/lnmp-windows-pm-repo/edge/lwpm.json | 11 +++---- windows/lnmp-windows-pm-repo/frp/lwpm.json | 4 +-- windows/lnmp-windows-pm-repo/nginx/lwpm.json | 5 ++++ windows/lnmp-windows-pm-repo/nginx/lwpm.yaml | 4 +++ windows/lnmp-windows-pm-repo/php/lwpm.json | 6 ++++ windows/lnmp-windows-pm-repo/php/lwpm.yaml | 5 ++++ 12 files changed, 127 insertions(+), 13 deletions(-) create mode 100644 windows/lnmp-windows-pm-repo/chrome-beta/lwpm.json create mode 100644 windows/lnmp-windows-pm-repo/chrome-canary/lwpm.json create mode 100644 windows/lnmp-windows-pm-repo/chrome-dev/lwpm.json diff --git a/windows/lnmp-windows-pm-repo/7zip/lwpm.json b/windows/lnmp-windows-pm-repo/7zip/lwpm.json index dfd6da1bf..a399dbb4c 100644 --- a/windows/lnmp-windows-pm-repo/7zip/lwpm.json +++ b/windows/lnmp-windows-pm-repo/7zip/lwpm.json @@ -2,12 +2,13 @@ "name": "7zip", "description": "7-Zip is a file archiver with a high compression ratio", "version": "2201", - "pre-version": "2201", + "pre-version": "2300", "homepage": "https://www.7-zip.org/", "bug": "https://www.7-zip.org/support.html", "github": "", "releases": "https://github.com/microsoft/winget-pkgs/tree/master/manifests/7/7zip/7zip", "url": "https://www.7-zip.org/a/7z${VERSION}-x64.msi", + "url-mirror": "https://experiments-alicdn.sparanoid.net/7z/7z${VERSION}-x64.msi", "command": "7z.exe", "scripts": { "version": [ diff --git a/windows/lnmp-windows-pm-repo/adb/lwpm.json b/windows/lnmp-windows-pm-repo/adb/lwpm.json index a1f8e1e7c..ed1662647 100644 --- a/windows/lnmp-windows-pm-repo/adb/lwpm.json +++ b/windows/lnmp-windows-pm-repo/adb/lwpm.json @@ -8,11 +8,12 @@ "github": "", "releases": "https://developer.android.google.cn/studio/releases/platform-tools", "url": "https://dl.google.com/android/repository/platform-tools-latest-${env:LWPM_OS}.zip", - "url-mirror": "", + "url-mirror": "https://dl.google.com/android/repository/platform-tools_r${VERSION}-windows.zip", "pre-url": "", "pre-url-mirror": "", "command": "adb", "download-filename": "", + "winget-pkgs": "https://hub.fgit.ml/microsoft/winget-pkgs/tree/master/manifests/g/Google/PlatformTools", "scripts": { "preinstall": [ "# _cleanup \"$unzipDesc\"" diff --git a/windows/lnmp-windows-pm-repo/chrome-beta/lwpm.json b/windows/lnmp-windows-pm-repo/chrome-beta/lwpm.json new file mode 100644 index 000000000..a146d37cd --- /dev/null +++ b/windows/lnmp-windows-pm-repo/chrome-beta/lwpm.json @@ -0,0 +1,30 @@ +{ + "name": "chrome-beta", + "description": "", + "version": "", + "pre-version": "", + "homepage": "https://www.google.cn/chrome/index.html", + "bug": "", + "github": "", + "releases": "https://www.google.cn/intl/zh-CN/chrome/beta/", + "url": "https://dl.google.com/tag/s/dl/chrome/install/beta/googlechromebetastandaloneenterprise64.msi", + "url-mirror": "", + "pre-url": "", + "pre-url-mirror": "", + "scripts": { + "preinstall": "", + "install": [ + "start-process $filename" + ], + "postinstall": "", + "preuninstall": "", + "uninstall": "", + "postuninstall": "", + "pretest": "", + "test": "", + "posttest":"" + }, + "path": [ + "C:\\bin" + ] +} diff --git a/windows/lnmp-windows-pm-repo/chrome-canary/lwpm.json b/windows/lnmp-windows-pm-repo/chrome-canary/lwpm.json new file mode 100644 index 000000000..03a2fd68c --- /dev/null +++ b/windows/lnmp-windows-pm-repo/chrome-canary/lwpm.json @@ -0,0 +1,30 @@ +{ + "name": "chrome-canary", + "description": "", + "version": "", + "pre-version": "", + "homepage": "https://www.google.cn/chrome/index.html", + "bug": "", + "github": "", + "releases": "https://www.google.cn/intl/zh-CN/chrome/canary/", + "url": "https://dl.google.com/tag/s/appguid%3D%7B4EA16AC7-FD5A-47C3-875B-DBF4A2008C20%7D%26usagestats%3D1%26ap%3Dx64-canary-statsdef_1/update2/installers/ChromeSetup.exe", + "url-mirror": "", + "pre-url": "", + "pre-url-mirror": "", + "scripts": { + "preinstall": "", + "install": [ + "start-process $filename" + ], + "postinstall": "", + "preuninstall": "", + "uninstall": "", + "postuninstall": "", + "pretest": "", + "test": "", + "posttest":"" + }, + "path": [ + "C:\\bin" + ] +} diff --git a/windows/lnmp-windows-pm-repo/chrome-dev/lwpm.json b/windows/lnmp-windows-pm-repo/chrome-dev/lwpm.json new file mode 100644 index 000000000..10c84952e --- /dev/null +++ b/windows/lnmp-windows-pm-repo/chrome-dev/lwpm.json @@ -0,0 +1,30 @@ +{ + "name": "chrome-dev", + "description": "", + "version": "", + "pre-version": "", + "homepage": "https://www.google.cn/chrome/index.html", + "bug": "", + "github": "", + "releases": "https://www.google.cn/intl/zh-CN/chrome/dev/", + "url": "https://dl.google.com/tag/s/dl/chrome/install/dev/googlechromedevstandaloneenterprise64.msi", + "url-mirror": "", + "pre-url": "", + "pre-url-mirror": "", + "scripts": { + "preinstall": "", + "install": [ + "start-process $filename" + ], + "postinstall": "", + "preuninstall": "", + "uninstall": "", + "postuninstall": "", + "pretest": "", + "test": "", + "posttest":"" + }, + "path": [ + "C:\\bin" + ] +} diff --git a/windows/lnmp-windows-pm-repo/chrome/lwpm.json b/windows/lnmp-windows-pm-repo/chrome/lwpm.json index b49b12610..444d4a130 100644 --- a/windows/lnmp-windows-pm-repo/chrome/lwpm.json +++ b/windows/lnmp-windows-pm-repo/chrome/lwpm.json @@ -1,20 +1,21 @@ { "name": "chrome", - "description": "", + "description": "A more simple, secure, and faster web browser than ever, with Google's smarts built-in.", "version": "", "pre-version": "", "homepage": "https://www.google.cn/chrome/index.html", "bug": "", "github": "", - "releases": "https://www.google.cn/intl/zh-CN/chrome/canary/", - "url": "", + "releases": "https://www.google.cn/chrome/index.html", + "url": "https://dl.google.com/dl/chrome/install/googlechromestandaloneenterprise64.msi", "url-mirror": "", "pre-url": "", "pre-url-mirror": "", + "winget-pkgs": "https://hub.fgit.ml/microsoft/winget-pkgs/tree/master/manifests/g/Google/Chrome", "scripts": { "preinstall": "", "install": [ - "Write-Host \"`nPlease download on this website: ${releases}`n\" -ForegroundColor Green" + "start-process $filename" ], "postinstall": "", "preuninstall": "", diff --git a/windows/lnmp-windows-pm-repo/edge/lwpm.json b/windows/lnmp-windows-pm-repo/edge/lwpm.json index 0b5b89e49..fc7a77020 100644 --- a/windows/lnmp-windows-pm-repo/edge/lwpm.json +++ b/windows/lnmp-windows-pm-repo/edge/lwpm.json @@ -1,19 +1,20 @@ { "name": "edge", - "description": "", - "version": "", + "description": "World-class performance with more privacy, more productivity, and more value while you browse.", + "version": "113.0.1774.50", "pre-version": "", "homepage": "https://www.microsoftedgeinsider.com", "bug": "", "github": "", "releases": "https://www.microsoftedgeinsider.com/en-us/download/", - "url": "", + "url": "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/d9d8b4d4-0136-4c8f-8dfe-4c3ff29b2473/MicrosoftEdgeEnterpriseX64.msi", "url-mirror": "", - "pre-url": "", + "pre-url": "https://c2rsetup.edog.officeapps.live.com/c2r/downloadEdge.aspx?platform=Default&source=EdgeInsiderPage&Channel=Canary&language=en", "pre-url-mirror": "", + "winget-pkgs": "https://hub.fgit.ml/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/Edge", "scripts": { "preinstall": "", - "install": "Write-Host \"`nPlease download on this website: ${releases}`n\" -ForegroundColor Green", + "install": "start-process $filename", "postinstall": "", "preuninstall": "", "uninstall": "", diff --git a/windows/lnmp-windows-pm-repo/frp/lwpm.json b/windows/lnmp-windows-pm-repo/frp/lwpm.json index d8ad70cd7..67a81c408 100644 --- a/windows/lnmp-windows-pm-repo/frp/lwpm.json +++ b/windows/lnmp-windows-pm-repo/frp/lwpm.json @@ -1,8 +1,8 @@ { "name": "frp", "description": "A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet", - "version": "0.44.0", - "pre-version": "0.44.0", + "version": "0.48.0", + "pre-version": "0.48.0", "homepage": "https://github.com/fatedier/frp", "bug": "https://github.com/fatedier/frp/issues", "github": "fatedier/frp", diff --git a/windows/lnmp-windows-pm-repo/nginx/lwpm.json b/windows/lnmp-windows-pm-repo/nginx/lwpm.json index ba44a8617..f7e0b5b7f 100644 --- a/windows/lnmp-windows-pm-repo/nginx/lwpm.json +++ b/windows/lnmp-windows-pm-repo/nginx/lwpm.json @@ -17,6 +17,11 @@ "preinstall": [ "# https://docs.microsoft.com/zh-cn/cpp/windows/redistributing-visual-cpp-files?view=msvc-170#install-the-redistributable-packages\n# check vclib installed\nif(!(Test-Path 'HKLM:\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64')){\n PrintError 'Please install vclib first, exec $ lpm install vclib'\n\n exit 1\n}\n\nif((Get-ItemProperty 'HKLM:\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64').Installed -ne 1){\n PrintError 'Please install vclib first, exec $ lpm install vclib'\n\n exit 1\n}\n\nprintInfo 'vclib already installed, continue ...'\n\nGet-Process nginx -ErrorAction \"SilentlyContinue\" | out-null\n\nif ($?){\n PrintError 'Please stop nginx first, exec $.\\windows\\lnmp-wnamp.ps1 stop nginx'\n\n exit 1\n}\n" ], + "service": [ + "C:/nginx/nginx.exe", + "-p", + "C:/nginx" + ], "test": "nginx -v", "uninstall": "Get-Process nginx -ErrorAction \"SilentlyContinue\" | out-null\nif ($?){\n PrintError 'Please stop nginx first, exec $.\\windows\\lnmp-wnamp.ps1 stop nginx'\n\n exit 1\n}\n_cleanup C:\\nginx\n", "version": "nginx -v > $env:TEMP/.nginx.version 2>&1\n$(Get-Content $env:TEMP/.nginx.version).split(' ')[2].split('/')[1]\n" diff --git a/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml b/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml index f164b073d..97ed237b8 100644 --- a/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml @@ -12,6 +12,10 @@ path: - C:\nginx command: nginx scripts: + service: + - C:/nginx/nginx.exe + - -p + - C:/nginx version: | nginx -v > $env:TEMP/.nginx.version 2>&1 $(Get-Content $env:TEMP/.nginx.version).split(' ')[2].split('/')[1] diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.json b/windows/lnmp-windows-pm-repo/php/lwpm.json index 09f8c7913..5a13d83fe 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php/lwpm.json @@ -22,6 +22,12 @@ "preinstall": [ "# https://docs.microsoft.com/zh-cn/cpp/windows/redistributing-visual-cpp-files?view=msvc-170#install-the-redistributable-packages\n# check vclib installed\nif(!(Test-Path 'HKLM:\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64')){\n PrintError 'Please install vclib first, exec $ lpm install vclib'\n\n exit 1\n}\n\nif((Get-ItemProperty 'HKLM:\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64').Installed -ne 1){\n PrintError 'Please install vclib first, exec $ lpm install vclib'\n\n exit 1\n}\n\nprintInfo 'vclib already installed, continue ...'\n" ], + "service": [ + "C:/php/php-cgi-spawner.exe", + "c:/php/php-cgi.exe", + "9000", + "4+16" + ], "test": "& ${PHP_PREFIX}/php -v\n", "uninstall": "if($isPre -eq 1){_cleanup \"C:\\php-pre\"}else{_cleanup \"C:\\php\"}\n", "version": "(php -v).split(\" \")[1]" diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.yaml b/windows/lnmp-windows-pm-repo/php/lwpm.yaml index 8c43329fd..65d351549 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php/lwpm.yaml @@ -12,6 +12,11 @@ path: command: php download-filename: php-${VERSION}-${VC_VERSION}-x64.zip scripts: + service: + - C:/php/php-cgi-spawner.exe + - c:/php/php-cgi.exe + - "9000" + - 4+16 platform-reqs: ["if(!$IsWindows){echo $False}"] uninstall: | if($isPre -eq 1){_cleanup "C:\php-pre"}else{_cleanup "C:\php"} From 85b602c3fc869bfe86415c340fd5ce239e1c49c8 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 21 May 2023 16:43:14 +0800 Subject: [PATCH 03/42] [Release] v20.10.26 Signed-off-by: Kang Huaishuai --- CHANGELOG.md | 2 +- lnmp-docker.ps1 | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b4915a0..1de2931c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Compare -* https://github.com/khs1994-docker/lnmp/compare/v20.10.25...20.10 +* https://github.com/khs1994-docker/lnmp/compare/v20.10.25...v20.10.26 ### Bug fixes: diff --git a/lnmp-docker.ps1 b/lnmp-docker.ps1 index 700b6842d..1e0ef9ace 100755 --- a/lnmp-docker.ps1 +++ b/lnmp-docker.ps1 @@ -1,10 +1,6 @@ <#PSScriptInfo -.VERSION 20.10.25 - -.GUID 9769fa4f-70c7-43ed-8d2b-a0018f7dc89f - .AUTHOR khs1994@khs1994.com .COMPANYNAME khs1994-docker From 1ceb70cab45c48f450225c4e01cb426ce18f79a0 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 21 May 2023 17:13:41 +0800 Subject: [PATCH 04/42] [PHP] Update to v8.2.4 v8.1.13 v8.0.27 Signed-off-by: Kang Huaishuai --- .env.example | 10 +-- .env.example.ps1 | 2 +- .../setup-php/.github/workflows/ci.yaml | 6 +- .github/actions/setup-php/action.yml | 2 +- .github/actions/setup-php/package.json | 2 +- .github/workflows/release.yaml | 36 +++++----- .pcit.yml | 2 +- CHANGELOG.md | 7 +- README.cn.md | 6 +- README.md | 6 +- app/demo/.drone.yml | 16 ++--- app/demo/.env.example | 6 +- app/demo/.github/workflows/ci.yml | 2 +- app/demo/.pcit.yml | 10 +-- app/demo/Dockerfile | 4 +- app/demo/deploy/test.Dockerfile | 2 +- app/demo/docker-compose.yml | 6 +- app/demo/docker-workspace.yml | 4 +- app/laravel-demo/Dockerfile | 4 +- app/laravel-demo/Dockerfile.buildkit | 4 +- app/laravel-demo/Dockerfile.cdn | 4 +- docker-lnmp.override.example.yml | 8 +-- docker-lnmp.yml | 4 +- docker-production.yml | 4 +- docker-workspace.example.yml | 4 +- dockerfile/php/.env.example | 8 +-- dockerfile/php/.github/workflows/php_8_0.yml | 4 +- dockerfile/php/.github/workflows/php_8_1.yml | 4 +- dockerfile/php/.github/workflows/php_8_2.yml | 4 +- .../php/.github/workflows/php_zz_tool.yml | 4 +- dockerfile/php/7.4/unit/Dockerfile | 2 +- dockerfile/php/8.0/cli/Dockerfile | 4 +- dockerfile/php/8.0/composer/Dockerfile | 2 +- dockerfile/php/8.0/fpm/Dockerfile | 2 +- dockerfile/php/8.0/s6/Dockerfile | 2 +- dockerfile/php/8.0/swoole/Dockerfile | 4 +- dockerfile/php/8.0/unit/Dockerfile | 4 +- dockerfile/php/8.1/cli/Dockerfile | 6 +- dockerfile/php/8.1/composer/Dockerfile | 2 +- dockerfile/php/8.1/fpm/Dockerfile | 4 +- dockerfile/php/8.1/s6/Dockerfile | 2 +- dockerfile/php/8.1/swoole/Dockerfile | 4 +- dockerfile/php/8.1/unit/Dockerfile | 4 +- dockerfile/php/8.2/cli/Dockerfile | 4 +- dockerfile/php/8.2/composer/Dockerfile | 2 +- dockerfile/php/8.2/fpm/Dockerfile | 2 +- dockerfile/php/8.2/s6/Dockerfile | 2 +- dockerfile/php/8.2/swoole/Dockerfile | 4 +- dockerfile/php/8.2/unit/Dockerfile | 6 +- dockerfile/php/README.md | 26 +++---- dockerfile/php/doctum/Dockerfile | 2 +- dockerfile/php/nightly/cli/Dockerfile | 2 +- dockerfile/php/nightly/fpm/Dockerfile | 2 +- dockerfile/php/php-cs-fixer/Dockerfile | 2 +- dockerfile/php/phploc/Dockerfile | 2 +- dockerfile/php/phpmd/Dockerfile | 2 +- dockerfile/php/sync/docker-image-sync.json | 36 +++++----- dockerfile/php/sync/manifest.txt | 36 +++++----- dockerfile/php/tests/git/Dockerfile | 2 +- docs/custom.md | 4 +- kubernetes/lnmp/php/base/lnmp-php.yaml | 2 +- lrew/nginx-unit/docker-compose.yml | 2 +- scripts/docker-compose.bump.yml | 4 +- vscode-remote/docker-workspace.yml | 4 +- windows/lnmp-windows-pm-repo/php/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/php/lwpm.yaml | 4 +- wsl/.env | 6 +- wsl/Dockerfile | 2 +- wsl/docker-compose.yml | 72 +++++++++---------- wsl/lnmp-wsl-builder-php | 2 +- wsl/lnmp-wsl-builder-php-rhel | 2 +- wsl/wsl.phpbuilder.Dockerfile | 2 +- wsl/wsl.phpbuilder.rhel.Dockerfile | 2 +- 73 files changed, 235 insertions(+), 236 deletions(-) diff --git a/.env.example b/.env.example index bf5a63e83..08fb686a7 100644 --- a/.env.example +++ b/.env.example @@ -126,7 +126,7 @@ LNMP_NGINX_VERSION=1.23.3 LNMP_MYSQL_VERSION=8.0.33 -LNMP_PHP_VERSION=8.2.3 +LNMP_PHP_VERSION=8.2.4 # LNMP_PHP_VERSION=nightly # EOL @@ -139,10 +139,10 @@ LNMP_PHP72_VERSION=7.2.34 LNMP_PHP73_VERSION=7.3.33 LNMP_PHP74_VERSION=7.4.33 # EOL -LNMP_PHP8_VERSION=8.2.3 -LNMP_PHP80_VERSION=8.0.26 -LNMP_PHP81_VERSION=8.1.12 -LNMP_PHP82_VERSION=8.2.3 +LNMP_PHP8_VERSION=8.2.4 +LNMP_PHP80_VERSION=8.0.27 +LNMP_PHP81_VERSION=8.1.13 +LNMP_PHP82_VERSION=8.2.4 LNMP_REDIS_VERSION=7.0.0 diff --git a/.env.example.ps1 b/.env.example.ps1 index ba0d2484c..f4dd3750e 100644 --- a/.env.example.ps1 +++ b/.env.example.ps1 @@ -7,7 +7,7 @@ $CI_HOST="ci.khs1994.com:1218" # $ wsl -l $DistributionName="Ubuntu-22.04" -$LNMP_PHP_IMAGE="khs1994/php:8.2.3-composer-alpine" +$LNMP_PHP_IMAGE="khs1994/php:8.2.4-composer-alpine" $NGINX_PATH="C:/nginx" $PHP_PATH="C:/php" diff --git a/.github/actions/setup-php/.github/workflows/ci.yaml b/.github/actions/setup-php/.github/workflows/ci.yaml index 90d6be012..91916a63d 100644 --- a/.github/actions/setup-php/.github/workflows/ci.yaml +++ b/.github/actions/setup-php/.github/workflows/ci.yaml @@ -10,9 +10,9 @@ jobs: matrix: php_version: - nightly - - 8.2.3 - - 8.1.12 - - 8.0.26 + - 8.2.4 + - 8.1.13 + - 8.0.27 # EOL - 7.4.33 - 7.3.33 diff --git a/.github/actions/setup-php/action.yml b/.github/actions/setup-php/action.yml index aeaf9189c..b9c09e2ce 100644 --- a/.github/actions/setup-php/action.yml +++ b/.github/actions/setup-php/action.yml @@ -6,7 +6,7 @@ author: 'khs1994' inputs: php_version: description: PHP version - default: "8.2.3" + default: "8.2.4" required: false php_type: description: php image type, fpm | composer | swoole | php-cs-fixer | doctum diff --git a/.github/actions/setup-php/package.json b/.github/actions/setup-php/package.json index b2c6587fb..8560feac6 100644 --- a/.github/actions/setup-php/package.json +++ b/.github/actions/setup-php/package.json @@ -12,7 +12,7 @@ }, "devDependencies": {}, "scripts": { - "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.2.3' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" + "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.2.4' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" }, "author": "", "license": "ISC" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a25a88d2f..5807d744c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,59 +16,59 @@ jobs: - 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.26-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.27-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-81 - DIST_FILE: khs1994-wsl-php81_8.1.12-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.13-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-nightly DIST_FILE: khs1994-wsl-php83_0.0.0-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-debian12-81 - DIST_FILE: khs1994-wsl-php81_8.1.12-debian-bookworm_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.13-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.26-ubuntu-bionic_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.27-ubuntu-bionic_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu1804-81 - DIST_FILE: khs1994-wsl-php81_8.1.12-ubuntu-bionic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.13-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.26-ubuntu-focal_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.27-ubuntu-focal_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2004-81 - DIST_FILE: khs1994-wsl-php81_8.1.12-ubuntu-focal_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.13-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.26-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.27-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-81 - DIST_FILE: khs1994-wsl-php81_8.1.12-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.13-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-nightly DIST_FILE: khs1994-wsl-php83_0.0.0-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2210-81 - DIST_FILE: khs1994-wsl-php81_8.1.12-ubuntu-kinetic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.13-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.26-1.el8.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.27-1.el8.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel8-81 - DIST_FILE: khs1994-wsl-php81-8.1.12-1.el8.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.13-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.26-1.el9.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.27-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel9-81 - DIST_FILE: khs1994-wsl-php81-8.1.12-1.el9.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.13-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky8-81 - DIST_FILE: khs1994-wsl-php81-8.1.12-1.el8.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.13-1.el8.rocky.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky9-81 - DIST_FILE: khs1994-wsl-php81-8.1.12-1.el9.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.13-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.26-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.27-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-81 - DIST_FILE: khs1994-wsl-php81-8.1.12-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.13-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 - JOB_NAME: wsl-php-builder-fc37-nightly diff --git a/.pcit.yml b/.pcit.yml index 53e4e2907..ea5b9fe9e 100644 --- a/.pcit.yml +++ b/.pcit.yml @@ -4,7 +4,7 @@ workspace: steps: bash: - image: khs1994/php:8.2.3-composer-alpine + image: khs1994/php:8.2.4-composer-alpine run: - pwd - bash ./lnmp-docker diff --git a/CHANGELOG.md b/CHANGELOG.md index 1de2931c8..fa007ad70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Changelog -## v20.10.26 +## v20.10.27 ### Compare -* https://github.com/khs1994-docker/lnmp/compare/v20.10.25...v20.10.26 +* https://github.com/khs1994-docker/lnmp/compare/v20.10.26...20.10 ### Bug fixes: @@ -14,5 +14,4 @@ ### Updates: -* [PHP `8.2.3` `8.1.12` `8.0.26`](https://www.php.net/ChangeLog-8.php#8.1.12) -* [MySQL `8.0.33`](https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-33.html) +* [PHP `8.2.4` `8.1.13` `8.0.27`](https://www.php.net/ChangeLog-8.php#8.1.13) diff --git a/README.cn.md b/README.cn.md index ab53bc80a..8a19ebe88 100644 --- a/README.cn.md +++ b/README.cn.md @@ -202,13 +202,13 @@ $ ./lnmp-docker down |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.23.3-alpine` | **1.23.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.3-unit-alpine`| **1.28.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.4-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.3` | **10.11.3** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.3-fpm-alpine` | **8.2.3** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.3-composer-alpine`| **2.5.5** |`alpine:3.16` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.4-fpm-alpine` | **8.2.4** |`alpine:3.16` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.4-composer-alpine`| **2.5.5** |`alpine:3.16` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/README.md b/README.md index 020d9d1f2..92975faa2 100644 --- a/README.md +++ b/README.md @@ -197,13 +197,13 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.23.3-alpine` | **1.23.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.3-unit-alpine`| **1.28.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.4-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.3` | **10.11.3** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.3-fpm-alpine` | **8.2.3** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.3-composer-alpine`| **2.5.5** |`alpine:3.16` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.4-fpm-alpine` | **8.2.4** |`alpine:3.16` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.4-composer-alpine`| **2.5.5** |`alpine:3.16` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/app/demo/.drone.yml b/app/demo/.drone.yml index 2208f8266..d812a4f44 100644 --- a/app/demo/.drone.yml +++ b/app/demo/.drone.yml @@ -34,7 +34,7 @@ steps: # install dep - name: install # image: composer:2.5.5 - image: khs1994/php:8.2.3-composer-alpine + image: khs1994/php:8.2.4-composer-alpine commands: - pwd - composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/ @@ -46,7 +46,7 @@ steps: # test script - name: script - image: khs1994/php:8.2.3-fpm-alpine + image: khs1994/php:8.2.4-fpm-alpine # pull: always | never | if-not-exists # detach: true # privileged: true @@ -92,7 +92,7 @@ steps: settings: # registry: docker.khs1994.com repo: khs1994/php - tags: 8.2.3-pro-${DRONE_TAG}-alpine + tags: 8.2.4-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com # build_args: @@ -142,7 +142,7 @@ steps: image: plugins/docker settings: repo: khs1994/php - tags: 8.2.3-pro-${DRONE_TAG}-alpine + tags: 8.2.4-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com username: @@ -179,7 +179,7 @@ steps: event: [ tag ] - name: after_success - image: khs1994/php:8.2.3-composer-alpine + image: khs1994/php:8.2.4-composer-alpine when: status: success commands: @@ -228,9 +228,9 @@ volumes: # COMPOSER_VERSION: # - 2.5.5 # PHP_VERSION: -# - 8.2.3 -# - 8.1.12 -# - 8.0.26 +# - 8.2.4 +# - 8.1.13 +# - 8.0.27 # # - 7.4.33 # # - 7.3.33 # # - 7.2.34 diff --git a/app/demo/.env.example b/app/demo/.env.example index 114acf55d..b588f6584 100644 --- a/app/demo/.env.example +++ b/app/demo/.env.example @@ -1,8 +1,8 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION=8.2.3 -# PHP_VERSION=8.1.12 -# PHP_VERSION=8.0.26 +PHP_VERSION=8.2.4 +# PHP_VERSION=8.1.13 +# PHP_VERSION=8.0.27 # PHP_VERSION=7.4.33 # PHP_VERSION=7.3.33 # PHP_VERSION=7.2.34 diff --git a/app/demo/.github/workflows/ci.yml b/app/demo/.github/workflows/ci.yml index fbd652681..5be9b3c4f 100644 --- a/app/demo/.github/workflows/ci.yml +++ b/app/demo/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: test: strategy: matrix: - php_version: ["8.0.26","8.1.12","8.2.3"] + php_version: ["8.0.27","8.1.13","8.2.4"] runs-on: ubuntu-latest # needs: job steps: diff --git a/app/demo/.pcit.yml b/app/demo/.pcit.yml index 6478f1b7a..d3d88a6e7 100644 --- a/app/demo/.pcit.yml +++ b/app/demo/.pcit.yml @@ -16,7 +16,7 @@ steps: # install dep install: # image: composer:${COMPOSER_VERSION} - image: khs1994/php:8.2.3-composer-alpine + image: khs1994/php:8.2.4-composer-alpine shell: bash run: - pwd @@ -80,7 +80,7 @@ steps: event: tag after_success: - image: khs1994/php:8.2.3-composer-alpine + image: khs1994/php:8.2.4-composer-alpine shell: bash if: status: success @@ -129,9 +129,9 @@ jobs: COMPOSER_VERSION: - 2.5.5 PHP_VERSION: - - 8.2.3 - - 8.1.12 - - 8.0.26 + - 8.2.4 + - 8.1.13 + - 8.0.27 # - 7.4.33 # - 7.3.33 # - 7.2.34 diff --git a/app/demo/Dockerfile b/app/demo/Dockerfile index 444c6cd4d..c8cfc1fef 100644 --- a/app/demo/Dockerfile +++ b/app/demo/Dockerfile @@ -9,7 +9,7 @@ # !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !! ARG NODE_VERSION=18.2.0 -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG NGINX_VERSION=1.15.0 ARG DOCKER_HUB_USERNAME=khs1994 @@ -28,7 +28,7 @@ RUN cd /app \ --no-plugins # 2.将项目打入 PHP 镜像 -# $ docker build -t khs1994/php:8.2.3-pro-GIT_TAG-alpine --target=php . +# $ docker build -t khs1994/php:8.2.4-pro-GIT_TAG-alpine --target=php . FROM ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION}-fpm-alpine as php diff --git a/app/demo/deploy/test.Dockerfile b/app/demo/deploy/test.Dockerfile index bf27de5e1..4170e432a 100644 --- a/app/demo/deploy/test.Dockerfile +++ b/app/demo/deploy/test.Dockerfile @@ -2,7 +2,7 @@ # TEST PHP PROJECT BY Docker # -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG GIT_REPO={{ EXAMPLE_GIT_URL_EXAMPLE }}/{{ EXAMPLE_GIT_USERNAME_EXAMPLE }}/{{ EXAMPLE_GIT_REPO_EXAMPLE }}.git FROM khs1994/php:${PHP_VERSION}-composer-alpine diff --git a/app/demo/docker-compose.yml b/app/demo/docker-compose.yml index d4e63b2f7..bf96ee6a4 100644 --- a/app/demo/docker-compose.yml +++ b/app/demo/docker-compose.yml @@ -19,7 +19,7 @@ services: context: . dockerfile: deploy/test.Dockerfile args: - - PHP_VERSION=${PHP_VERSION:-8.2.3} + - PHP_VERSION=${PHP_VERSION:-8.2.4} image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE nginx: @@ -39,7 +39,7 @@ services: dockerfile: Dockerfile target: php args: - - PHP_VERSION=${PHP_VERSION:-8.2.3} + - PHP_VERSION=${PHP_VERSION:-8.2.4} - NODE_VERSION=${NODE_VERSION:-18.2.0} - NODE_REGISTRY=https://registry.npmmirror.com - image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.3}-pro-alpine + image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.4}-pro-alpine diff --git a/app/demo/docker-workspace.yml b/app/demo/docker-workspace.yml index 4e7671490..7656cb146 100644 --- a/app/demo/docker-workspace.yml +++ b/app/demo/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.3-composer-alpine + image: khs1994/php:8.2.4-composer-alpine networks: - backend volumes: @@ -67,7 +67,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.3-composer-alpine" + image: "khs1994/php:8.2.4-composer-alpine" command: [] # install | update npm: diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index f18c6f023..3ad3441e0 100644 --- a/app/laravel-demo/Dockerfile +++ b/app/laravel-demo/Dockerfile @@ -14,12 +14,12 @@ # $ docker build --target=laravel -t khs1994/laravel:10 --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=18.2.0 -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG NGINX_VERSION=1.23.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.3-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.4-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.buildkit b/app/laravel-demo/Dockerfile.buildkit index d3c44e52d..6da8ebbe6 100644 --- a/app/laravel-demo/Dockerfile.buildkit +++ b/app/laravel-demo/Dockerfile.buildkit @@ -16,12 +16,12 @@ # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.buildkit --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=18.2.0 -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG NGINX_VERSION=1.23.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.3-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.4-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY --link composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.cdn b/app/laravel-demo/Dockerfile.cdn index c2d4ae205..4b6f9ee6b 100644 --- a/app/laravel-demo/Dockerfile.cdn +++ b/app/laravel-demo/Dockerfile.cdn @@ -15,12 +15,12 @@ # # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.cdn --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG NGINX_VERSION=1.23.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.3-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.4-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/docker-lnmp.override.example.yml b/docker-lnmp.override.example.yml index 49ae6ecb6..78945879e 100644 --- a/docker-lnmp.override.example.yml +++ b/docker-lnmp.override.example.yml @@ -27,11 +27,11 @@ services: # php8: # &php8 # # ! change php8 default image - # image: username/php:${LNMP_PHP8_VERSION:-8.2.3}-fpm-alpine + # image: username/php:${LNMP_PHP8_VERSION:-8.2.4}-fpm-alpine # # ! cn mirror image - # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.3}-fpm-alpine + # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.4}-fpm-alpine # # ! s6 - # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.3}-s6-alpine + # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.4}-s6-alpine # # command: [] # # ! open more port # ports: @@ -74,7 +74,7 @@ services: swoole: << : *common - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.3}-swoole-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.4}-swoole-alpine # command 指令只需传入文件名即可 command: - /app/swoole/index.php diff --git a/docker-lnmp.yml b/docker-lnmp.yml index 460e8e10d..c04e731e3 100644 --- a/docker-lnmp.yml +++ b/docker-lnmp.yml @@ -169,7 +169,7 @@ services: php8: &php8 << : [*common,*common-labels] - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.3}-fpm-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.4}-fpm-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} @@ -220,7 +220,7 @@ services: composer: << : [*common,*common-labels] restart: "no" - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.3}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.4}-composer-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} diff --git a/docker-production.yml b/docker-production.yml index e238b91c0..e291ea977 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -74,7 +74,7 @@ x-build-debian: x-php-common: &default-php - image: khs1994/php:8.2.3-fpm-alpine + image: khs1994/php:8.2.4-fpm-alpine volumes: - ./app:/app - type: volume @@ -364,7 +364,7 @@ services: - *common - *default-labels - *default-php - # image: khs1994/php:8.2.3-s6-alpine + # image: khs1994/php:8.2.4-s6-alpine # entrypoint: # - /s6-init build: diff --git a/docker-workspace.example.yml b/docker-workspace.example.yml index e2f1b5614..094d20bb2 100644 --- a/docker-workspace.example.yml +++ b/docker-workspace.example.yml @@ -11,7 +11,7 @@ x-common: services: workspace: &workspace - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.3}-composer-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.4}-composer-alpine networks: - backend volumes: @@ -71,7 +71,7 @@ services: << : - *workspace - *common - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.3}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.4}-composer-alpine" command: [] # install | update npm: diff --git a/dockerfile/php/.env.example b/dockerfile/php/.env.example index aa4c03e5c..339bb58d0 100644 --- a/dockerfile/php/.env.example +++ b/dockerfile/php/.env.example @@ -1,8 +1,8 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION_82=8.2.3 -PHP_VERSION_81=8.1.12 -PHP_VERSION_80=8.0.26 +PHP_VERSION_82=8.2.4 +PHP_VERSION_81=8.1.13 +PHP_VERSION_80=8.0.27 # EOL PHP_VERSION_74=7.4.33 PHP_VERSION_73=7.3.33 @@ -16,7 +16,7 @@ COMPOSER_VERSION=2.5.5 # https://github.com/swoole/swoole-src/tags SWOOLE_VERSION=5.0.0 # https://github.com/nginx/unit/tags -NGINX_UNIT_VERSION=1.28.0 +NGINX_UNIT_VERSION=1.30.0 # https://github.com/FriendsOfPHP/PHP-CS-Fixer/tags PHP_CS_FIXER_VERSION=3.7.0 diff --git a/dockerfile/php/.github/workflows/php_8_0.yml b/dockerfile/php/.github/workflows/php_8_0.yml index 8f3c6f7b5..f66796485 100644 --- a/dockerfile/php/.github/workflows/php_8_0.yml +++ b/dockerfile/php/.github/workflows/php_8_0.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.0.26" + default: "8.0.27" name: PHP_8.0 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_0_X FOLDER: "8.0" - PHP_TAG_VERSION: "8.0.26" + PHP_TAG_VERSION: "8.0.27" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_8_1.yml b/dockerfile/php/.github/workflows/php_8_1.yml index 83827c024..8f2c2bf5f 100644 --- a/dockerfile/php/.github/workflows/php_8_1.yml +++ b/dockerfile/php/.github/workflows/php_8_1.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.1.12" + default: "8.1.13" name: PHP_8.1 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.12" + PHP_TAG_VERSION: "8.1.13" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_8_2.yml b/dockerfile/php/.github/workflows/php_8_2.yml index b2ca52588..b1c451963 100644 --- a/dockerfile/php/.github/workflows/php_8_2.yml +++ b/dockerfile/php/.github/workflows/php_8_2.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.2.3" + default: "8.2.4" name: PHP_8.2 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_2_X FOLDER: "8.2" - PHP_TAG_VERSION: "8.2.3" + PHP_TAG_VERSION: "8.2.4" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_zz_tool.yml b/dockerfile/php/.github/workflows/php_zz_tool.yml index ed8f0d4a0..9014faebf 100644 --- a/dockerfile/php/.github/workflows/php_zz_tool.yml +++ b/dockerfile/php/.github/workflows/php_zz_tool.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.1.12" + default: "8.1.13" name: PHP_TOOL @@ -180,7 +180,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.12" + PHP_TAG_VERSION: "8.1.13" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/7.4/unit/Dockerfile b/dockerfile/php/7.4/unit/Dockerfile index cf09f8695..c8cff4764 100644 --- a/dockerfile/php/7.4/unit/Dockerfile +++ b/dockerfile/php/7.4/unit/Dockerfile @@ -6,7 +6,7 @@ FROM --platform=$TARGETPLATFORM ${USERNAME}/php:${PHP_VERSION}-cli-alpine LABEL maintainer="khs1994-docker/lnmp " -ENV NGINX_UNIT_VERSION=1.28.0 +ENV NGINX_UNIT_VERSION=1.30.0 # ENV NGINX_UNIT_VERSION=master RUN set -x \ diff --git a/dockerfile/php/8.0/cli/Dockerfile b/dockerfile/php/8.0/cli/Dockerfile index 0628a6a65..3843e6603 100644 --- a/dockerfile/php/8.0/cli/Dockerfile +++ b/dockerfile/php/8.0/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.26 +ARG PHP_VERSION=8.0.27 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.0.26 +ARG PHP_VERSION=8.0.27 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.0/composer/Dockerfile b/dockerfile/php/8.0/composer/Dockerfile index 7b7880500..ec3c5b4f9 100644 --- a/dockerfile/php/8.0/composer/Dockerfile +++ b/dockerfile/php/8.0/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.26 +ARG PHP_VERSION=8.0.27 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.0/fpm/Dockerfile b/dockerfile/php/8.0/fpm/Dockerfile index dc376ad89..d78ae5ac8 100644 --- a/dockerfile/php/8.0/fpm/Dockerfile +++ b/dockerfile/php/8.0/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.26 +ARG PHP_VERSION=8.0.27 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.16 as php diff --git a/dockerfile/php/8.0/s6/Dockerfile b/dockerfile/php/8.0/s6/Dockerfile index e3bc598ce..881518fa6 100644 --- a/dockerfile/php/8.0/s6/Dockerfile +++ b/dockerfile/php/8.0/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.26 +ARG PHP_VERSION=8.0.27 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.0/swoole/Dockerfile b/dockerfile/php/8.0/swoole/Dockerfile index ddb012207..3e8ab4465 100644 --- a/dockerfile/php/8.0/swoole/Dockerfile +++ b/dockerfile/php/8.0/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.26 +ARG PHP_VERSION=8.0.27 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.0 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.0.26-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.0.27-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.0/unit/Dockerfile b/dockerfile/php/8.0/unit/Dockerfile index 38ff44f6e..7188166d2 100644 --- a/dockerfile/php/8.0/unit/Dockerfile +++ b/dockerfile/php/8.0/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.26 +ARG PHP_VERSION=8.0.27 ARG USERNAME=khs1994 ARG BASE=cli @@ -7,7 +7,7 @@ FROM --platform=$TARGETPLATFORM ${USERNAME}/php:${PHP_VERSION}-${BASE}-alpine LABEL maintainer="khs1994-docker/lnmp " -ENV NGINX_UNIT_VERSION=1.28.0 +ENV NGINX_UNIT_VERSION=1.30.0 # ENV NGINX_UNIT_VERSION=master RUN set -x \ diff --git a/dockerfile/php/8.1/cli/Dockerfile b/dockerfile/php/8.1/cli/Dockerfile index 8d2cbb123..a20dde38d 100644 --- a/dockerfile/php/8.1/cli/Dockerfile +++ b/dockerfile/php/8.1/cli/Dockerfile @@ -1,16 +1,16 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.12 +ARG PHP_VERSION=8.1.13 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream -FROM --platform=$TARGETPLATFORM alpine:3.16 +FROM --platform=$TARGETPLATFORM alpine:3.17 LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.1.12 +ARG PHP_VERSION=8.1.13 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.1/composer/Dockerfile b/dockerfile/php/8.1/composer/Dockerfile index 0d0743fc1..b9096b65d 100644 --- a/dockerfile/php/8.1/composer/Dockerfile +++ b/dockerfile/php/8.1/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.12 +ARG PHP_VERSION=8.1.13 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.1/fpm/Dockerfile b/dockerfile/php/8.1/fpm/Dockerfile index 1da3df7cc..13e5cd510 100644 --- a/dockerfile/php/8.1/fpm/Dockerfile +++ b/dockerfile/php/8.1/fpm/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.12 +ARG PHP_VERSION=8.1.13 -FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.16 as php +FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/8.1/s6/Dockerfile b/dockerfile/php/8.1/s6/Dockerfile index a0957c7ee..9d5467e70 100644 --- a/dockerfile/php/8.1/s6/Dockerfile +++ b/dockerfile/php/8.1/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.12 +ARG PHP_VERSION=8.1.13 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.1/swoole/Dockerfile b/dockerfile/php/8.1/swoole/Dockerfile index 1e9bebd84..3f2787a4c 100644 --- a/dockerfile/php/8.1/swoole/Dockerfile +++ b/dockerfile/php/8.1/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.12 +ARG PHP_VERSION=8.1.13 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.0 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.1.12-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.1.13-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.1/unit/Dockerfile b/dockerfile/php/8.1/unit/Dockerfile index 06c021a98..56f247f82 100644 --- a/dockerfile/php/8.1/unit/Dockerfile +++ b/dockerfile/php/8.1/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.12 +ARG PHP_VERSION=8.1.13 ARG USERNAME=khs1994 ARG BASE=cli @@ -7,7 +7,7 @@ FROM --platform=$TARGETPLATFORM ${USERNAME}/php:${PHP_VERSION}-${BASE}-alpine LABEL maintainer="khs1994-docker/lnmp " -ENV NGINX_UNIT_VERSION=1.28.0 +ENV NGINX_UNIT_VERSION=1.30.0 # ENV NGINX_UNIT_VERSION=master RUN set -x \ diff --git a/dockerfile/php/8.2/cli/Dockerfile b/dockerfile/php/8.2/cli/Dockerfile index d3ad2f495..8c455e2a7 100644 --- a/dockerfile/php/8.2/cli/Dockerfile +++ b/dockerfile/php/8.2/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.2/composer/Dockerfile b/dockerfile/php/8.2/composer/Dockerfile index b3c65c529..bbb91fe10 100644 --- a/dockerfile/php/8.2/composer/Dockerfile +++ b/dockerfile/php/8.2/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.2/fpm/Dockerfile b/dockerfile/php/8.2/fpm/Dockerfile index dc2dc284d..2ef6aac1e 100644 --- a/dockerfile/php/8.2/fpm/Dockerfile +++ b/dockerfile/php/8.2/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php diff --git a/dockerfile/php/8.2/s6/Dockerfile b/dockerfile/php/8.2/s6/Dockerfile index c9e4a76ff..457d71393 100644 --- a/dockerfile/php/8.2/s6/Dockerfile +++ b/dockerfile/php/8.2/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.2/swoole/Dockerfile b/dockerfile/php/8.2/swoole/Dockerfile index c011b1934..9e269ee16 100644 --- a/dockerfile/php/8.2/swoole/Dockerfile +++ b/dockerfile/php/8.2/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=master ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.2.3-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.2.4-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.2/unit/Dockerfile b/dockerfile/php/8.2/unit/Dockerfile index 6eb715905..46f6dd0e3 100644 --- a/dockerfile/php/8.2/unit/Dockerfile +++ b/dockerfile/php/8.2/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG USERNAME=khs1994 ARG BASE=cli @@ -7,8 +7,8 @@ FROM --platform=$TARGETPLATFORM ${USERNAME}/php:${PHP_VERSION}-${BASE}-alpine LABEL maintainer="khs1994-docker/lnmp " -# ENV NGINX_UNIT_VERSION=1.28.0 -ENV NGINX_UNIT_VERSION=master +ENV NGINX_UNIT_VERSION=1.30.0 +# ENV NGINX_UNIT_VERSION=master RUN set -x \ && mkdir -p /usr/src/unit \ diff --git a/dockerfile/php/README.md b/dockerfile/php/README.md index ef4ddd76e..6fd609907 100644 --- a/dockerfile/php/README.md +++ b/dockerfile/php/README.md @@ -14,28 +14,28 @@ ## 后缀 -* 8.2.3-cli-alpine -* 8.2.3-fpm-alpine -* 8.2.3-unit-alpine (based cli) -* 8.2.3-composer-alpine (based fpm) -* 8.2.3-swoole-alpine (based cli) -* 8.2.3-s6-alpine (based fpm) +* 8.2.4-cli-alpine +* 8.2.4-fpm-alpine +* 8.2.4-unit-alpine (based cli) +* 8.2.4-composer-alpine (based fpm) +* 8.2.4-swoole-alpine (based cli) +* 8.2.4-s6-alpine (based fpm) ## Supported tags and respective `Dockerfile` links -* [`8.2.3-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.3/8.2/fpm/Dockerfile) +* [`8.2.4-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/8.2/fpm/Dockerfile) -* [`8.1.12-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.3/8.1/fpm/Dockerfile) +* [`8.1.13-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/8.1/fpm/Dockerfile) -* [`8.0.26-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.3/8.0/fpm/Dockerfile) +* [`8.0.27-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/8.0/fpm/Dockerfile) * [`nightly-fpm-alpine` (nightly/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/master/nightly/fpm/Dockerfile) -* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.3/7.4/fpm/Dockerfile) +* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/7.4/fpm/Dockerfile) -* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.3/7.3/fpm/Dockerfile) +* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/7.3/fpm/Dockerfile) -* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.3/7.2/fpm/Dockerfile) +* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/7.2/fpm/Dockerfile) ## Overview @@ -168,7 +168,7 @@ $ for ext in `ls /usr/src/php/ext`; do echo '*' $( php -r "if(extension_loaded(' * https://sources.debian.org/src/php7.4/7.4.33-1+deb11u1/debian/control/ -* https://sources.debian.org/src/php8.1/8.2.3-1/debian/control/ +* https://sources.debian.org/src/php8.1/8.2.4-1/debian/control/ * https://ram.tianon.xyz/post/2017/12/26/dockerize-compiled-software.html diff --git a/dockerfile/php/doctum/Dockerfile b/dockerfile/php/doctum/Dockerfile index 4dc8cf858..3fdd0a29c 100644 --- a/dockerfile/php/doctum/Dockerfile +++ b/dockerfile/php/doctum/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.26 +ARG PHP_VERSION=8.0.27 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/nightly/cli/Dockerfile b/dockerfile/php/nightly/cli/Dockerfile index 1c418c2f5..566df40eb 100644 --- a/dockerfile/php/nightly/cli/Dockerfile +++ b/dockerfile/php/nightly/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -FROM --platform=$TARGETPLATFORM alpine:3.16 +FROM --platform=$TARGETPLATFORM alpine:3.18 LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/nightly/fpm/Dockerfile b/dockerfile/php/nightly/fpm/Dockerfile index 0489ca40b..06b0a0450 100644 --- a/dockerfile/php/nightly/fpm/Dockerfile +++ b/dockerfile/php/nightly/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -FROM --platform=$TARGETPLATFORM alpine:3.16 as php +FROM --platform=$TARGETPLATFORM alpine:3.18 as php LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/php-cs-fixer/Dockerfile b/dockerfile/php/php-cs-fixer/Dockerfile index 319a853ef..0646686ea 100644 --- a/dockerfile/php/php-cs-fixer/Dockerfile +++ b/dockerfile/php/php-cs-fixer/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.12 +ARG PHP_VERSION=8.1.13 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/phploc/Dockerfile b/dockerfile/php/phploc/Dockerfile index 2af440c43..18a53f1f2 100644 --- a/dockerfile/php/phploc/Dockerfile +++ b/dockerfile/php/phploc/Dockerfile @@ -4,7 +4,7 @@ ARG PHP_VERSION=7.4.33 ARG USERNAME=khs1994 ARG BASE=composer -FROM alpine:3.16 as phploc-downloader +FROM alpine:3.17 as phploc-downloader # Copy/Paste Detector (CPD) for PHP code. https://github.com/sebastianbergmann/phploc diff --git a/dockerfile/php/phpmd/Dockerfile b/dockerfile/php/phpmd/Dockerfile index 7f8e9d1bc..80cbfe615 100644 --- a/dockerfile/php/phpmd/Dockerfile +++ b/dockerfile/php/phpmd/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.26 +ARG PHP_VERSION=8.0.27 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/sync/docker-image-sync.json b/dockerfile/php/sync/docker-image-sync.json index 097cb512d..47f588e64 100644 --- a/dockerfile/php/sync/docker-image-sync.json +++ b/dockerfile/php/sync/docker-image-sync.json @@ -1,57 +1,57 @@ [ { - "source": "php:8.2.3-cli-alpine" + "source": "php:8.2.4-cli-alpine" }, { - "source": "php:8.2.3-fpm-alpine" + "source": "php:8.2.4-fpm-alpine" }, { - "source": "php:8.2.3-unit-alpine" + "source": "php:8.2.4-unit-alpine" }, { - "source": "php:8.2.3-composer-alpine" + "source": "php:8.2.4-composer-alpine" }, { - "source": "php:8.2.3-swoole-alpine" + "source": "php:8.2.4-swoole-alpine" }, { - "source": "php:8.2.3-s6-alpine" + "source": "php:8.2.4-s6-alpine" }, { - "source": "php:8.1.12-cli-alpine" + "source": "php:8.1.13-cli-alpine" }, { - "source": "php:8.1.12-fpm-alpine" + "source": "php:8.1.13-fpm-alpine" }, { - "source": "php:8.1.12-unit-alpine" + "source": "php:8.1.13-unit-alpine" }, { - "source": "php:8.1.12-composer-alpine" + "source": "php:8.1.13-composer-alpine" }, { - "source": "php:8.1.12-swoole-alpine" + "source": "php:8.1.13-swoole-alpine" }, { - "source": "php:8.1.12-s6-alpine" + "source": "php:8.1.13-s6-alpine" }, { - "source": "php:8.0.26-cli-alpine" + "source": "php:8.0.27-cli-alpine" }, { - "source": "php:8.0.26-fpm-alpine" + "source": "php:8.0.27-fpm-alpine" }, { - "source": "php:8.0.26-unit-alpine" + "source": "php:8.0.27-unit-alpine" }, { - "source": "php:8.0.26-composer-alpine" + "source": "php:8.0.27-composer-alpine" }, { - "source": "php:8.0.26-swoole-alpine" + "source": "php:8.0.27-swoole-alpine" }, { - "source": "php:8.0.26-s6-alpine" + "source": "php:8.0.27-s6-alpine" }, { "source": "php:nightly-cli-alpine" diff --git a/dockerfile/php/sync/manifest.txt b/dockerfile/php/sync/manifest.txt index cdf021e9d..ae2a51135 100644 --- a/dockerfile/php/sync/manifest.txt +++ b/dockerfile/php/sync/manifest.txt @@ -1,21 +1,21 @@ -8.2.3-cli-alpine -8.2.3-fpm-alpine -8.2.3-unit-alpine -8.2.3-composer-alpine -8.2.3-swoole-alpine -8.2.3-s6-alpine -8.1.12-cli-alpine -8.1.12-fpm-alpine -8.1.12-unit-alpine -8.1.12-composer-alpine -8.1.12-swoole-alpine -8.1.12-s6-alpine -8.0.26-cli-alpine -8.0.26-fpm-alpine -8.0.26-unit-alpine -8.0.26-composer-alpine -8.0.26-swoole-alpine -8.0.26-s6-alpine +8.2.4-cli-alpine +8.2.4-fpm-alpine +8.2.4-unit-alpine +8.2.4-composer-alpine +8.2.4-swoole-alpine +8.2.4-s6-alpine +8.1.13-cli-alpine +8.1.13-fpm-alpine +8.1.13-unit-alpine +8.1.13-composer-alpine +8.1.13-swoole-alpine +8.1.13-s6-alpine +8.0.27-cli-alpine +8.0.27-fpm-alpine +8.0.27-unit-alpine +8.0.27-composer-alpine +8.0.27-swoole-alpine +8.0.27-s6-alpine 7.4.33-cli-alpine 7.4.33-fpm-alpine 7.4.33-unit-alpine diff --git a/dockerfile/php/tests/git/Dockerfile b/dockerfile/php/tests/git/Dockerfile index 299c58983..0e1446c7e 100644 --- a/dockerfile/php/tests/git/Dockerfile +++ b/dockerfile/php/tests/git/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.17 RUN apk add --no-cache git \ openssh-client \ diff --git a/docs/custom.md b/docs/custom.md index 5b4b68725..a4a011006 100644 --- a/docs/custom.md +++ b/docs/custom.md @@ -37,7 +37,7 @@ services: php8: # 想修改哪个配置在这里重写即可，例如想使用自己的 PHP 镜像或国内镜像，那么增加 `image` 指令即可 - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.3}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.4}-fpm-alpine ``` 你也可以加上 `build` 字段，先构建镜像再启动 @@ -48,7 +48,7 @@ services: services: php8: - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.3}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.4}-fpm-alpine # 增加 build 字段 build: context: ./dockerfile/php/ diff --git a/kubernetes/lnmp/php/base/lnmp-php.yaml b/kubernetes/lnmp/php/base/lnmp-php.yaml index 66e1a24a0..4ae995d4b 100644 --- a/kubernetes/lnmp/php/base/lnmp-php.yaml +++ b/kubernetes/lnmp/php/base/lnmp-php.yaml @@ -44,7 +44,7 @@ spec: kubernetes.io/os: linux containers: - name: lnmp-php - image: khs1994/php:8.2.3-fpm-alpine + image: khs1994/php:8.2.4-fpm-alpine imagePullPolicy: IfNotPresent args: - php-fpm diff --git a/lrew/nginx-unit/docker-compose.yml b/lrew/nginx-unit/docker-compose.yml index 11e8ad19d..1f91257dc 100644 --- a/lrew/nginx-unit/docker-compose.yml +++ b/lrew/nginx-unit/docker-compose.yml @@ -20,7 +20,7 @@ services: << : - *common - *common-label - image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.3}-unit-alpine" + image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.4}-unit-alpine" volumes: - ./config/${LNMP_NGINX_UNIT_CONF:-nginx-unit}:/etc/nginx-unit # ./path/unit-init-conf:/docker-entrypoint.d diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index 206753961..12c08e0f6 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -14,7 +14,7 @@ services: image: memcached:1.6.15-alpine php: - image: php:8.2.3-fpm-alpine + image: php:8.2.4-fpm-alpine composer: image: composer:2.5.5 @@ -23,7 +23,7 @@ services: image: nginx:1.23.3-alpine nginx-unit: - image: docker.io/nginx/unit:1.28.0-minimal + image: docker.io/nginx/unit:1.30.0-minimal rabbitmq: image: rabbitmq:3.9.0-management-alpine diff --git a/vscode-remote/docker-workspace.yml b/vscode-remote/docker-workspace.yml index 82b519257..13beeebfd 100644 --- a/vscode-remote/docker-workspace.yml +++ b/vscode-remote/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.3-composer-alpine + image: khs1994/php:8.2.4-composer-alpine networks: - backend volumes: @@ -68,7 +68,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.3-composer-alpine" + image: "khs1994/php:8.2.4-composer-alpine" command: [] # install | update npm: diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.json b/windows/lnmp-windows-pm-repo/php/lwpm.json index 5a13d83fe..bc70c5f16 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php/lwpm.json @@ -10,7 +10,7 @@ "C:\\php", "C:\\php-pre" ], - "pre-version": "8.2.3", + "pre-version": "8.2.4", "releases": "https://www.php.net/downloads.php", "scripts": { "get-version": "if(!($VERSION)){\n$VERSION=$stable_version\n}\nif($isPre){\n$VC_VERSION=\"nts-Win32-vs16\"\n$VERSION=$pre_version\n$url=\"https://windows.php.net/downloads/qa/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/qa/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php-pre\"\n$global:PHP_PREFIX=\"C:\\php-pre\"\n}else{\n$VC_VERSION=\"nts-Win32-vs16\"\n$url=\"https://windows.php.net/downloads/releases/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/releases/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php\"\n$global:PHP_PREFIX=\"C:\\php\"\n}", @@ -32,5 +32,5 @@ "uninstall": "if($isPre -eq 1){_cleanup \"C:\\php-pre\"}else{_cleanup \"C:\\php\"}\n", "version": "(php -v).split(\" \")[1]" }, - "version": "8.2.3" + "version": "8.2.4" } diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.yaml b/windows/lnmp-windows-pm-repo/php/lwpm.yaml index 65d351549..701d0fa78 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php/lwpm.yaml @@ -1,7 +1,7 @@ name: "php" description: "PHP is a popular general-purpose scripting language that is especially suited to web development" -version: "8.2.3" -pre-version: "8.2.3" +version: "8.2.4" +pre-version: "8.2.4" homepage: "https://www.php.net/" bug: "https://www.php.net/" github: "php/php-src" diff --git a/wsl/.env b/wsl/.env index a8da34f81..483e47c34 100644 --- a/wsl/.env +++ b/wsl/.env @@ -2,8 +2,8 @@ PHP_VERSION_71=7.1.33 PHP_VERSION_72=7.2.34 PHP_VERSION_73=7.3.33 PHP_VERSION_74=7.4.33 -PHP_VERSION_80=8.0.26 -PHP_VERSION_81=8.1.12 -PHP_VERSION_82=8.2.3 +PHP_VERSION_80=8.0.27 +PHP_VERSION_81=8.1.13 +PHP_VERSION_82=8.2.4 registry=docker.io diff --git a/wsl/Dockerfile b/wsl/Dockerfile index 05a878630..24bb0f0f2 100755 --- a/wsl/Dockerfile +++ b/wsl/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim ################################################################################ -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 ARG PHP_NUM=82 diff --git a/wsl/docker-compose.yml b/wsl/docker-compose.yml index 64d9f1d8b..47b60197d 100755 --- a/wsl/docker-compose.yml +++ b/wsl/docker-compose.yml @@ -22,22 +22,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.26} + - PHP_VERSION=${PHP_VERSION_80:-8.0.27} - 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.26}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.27}-debian-bullseye_amd64 wsl-php-builder-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - 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-php81_${PHP_VERSION_81:-8.1.12}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-debian-bullseye_amd64 wsl-php-builder-nightly: build: @@ -56,11 +56,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - OS_TYPE=debian:bookworm-slim - DEB_URL=mirrors.ustc.edu.cn - DEB_SECURITY_URL=mirrors.ustc.edu.cn/debian-security - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.12}-debian-bookworm_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-debian-bookworm_amd64 # https://endoflife.software/operating-systems/linux/ubuntu # https://github.com/docker-library/docs/tree/master/ubuntu @@ -80,22 +80,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.26} + - PHP_VERSION=${PHP_VERSION_80:-8.0.27} - 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.26}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.27}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu1804-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - 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-php81_${PHP_VERSION_81:-8.1.12}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu2004-74: build: @@ -113,22 +113,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.26} + - PHP_VERSION=${PHP_VERSION_80:-8.0.27} - 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.26}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.27}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2004-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - 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-php81_${PHP_VERSION_81:-8.1.12}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2204-74: build: @@ -146,22 +146,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.26} + - PHP_VERSION=${PHP_VERSION_80:-8.0.27} - 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.26}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.27}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - 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-php81_${PHP_VERSION_81:-8.1.12}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-nightly: build: @@ -180,11 +180,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - OS_TYPE=ubuntu:22.10 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.12}-ubuntu-kinetic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-ubuntu-kinetic_amd64 # rhel @@ -210,18 +210,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.26} + - PHP_VERSION=${PHP_VERSION_80:-8.0.27} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.26}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.27}-centos-8_amd64 wsl-php-builder-rhel8-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.12}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-centos-8_amd64 wsl-php-builder-rhel9-74: build: @@ -237,18 +237,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.26} + - PHP_VERSION=${PHP_VERSION_80:-8.0.27} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.26}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.27}-centos-9_amd64 wsl-php-builder-rhel9-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.12}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-centos-9_amd64 # https://github.com/docker-library/docs/tree/master/rockylinux @@ -257,18 +257,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - OS_TYPE=rockylinux:8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.12}-rocky-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-rocky-8_amd64 wsl-php-builder-rocky9-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - OS_TYPE=rockylinux:9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.12}-rocky-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-rocky-9_amd64 # fedora # https://github.com/docker-library/docs/tree/master/fedora @@ -287,18 +287,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.26} + - PHP_VERSION=${PHP_VERSION_80:-8.0.27} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.26}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.27}-fedora-36_amd64 wsl-php-builder-fc36-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.12} + - PHP_VERSION=${PHP_VERSION_81:-8.1.13} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.12}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-fedora-36_amd64 wsl-php-builder-fc36-nightly: build: diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index 0acfd8525..be005d8dd 100755 --- a/wsl/lnmp-wsl-builder-php +++ b/wsl/lnmp-wsl-builder-php @@ -66,7 +66,7 @@ export TZ=Asia/Shanghai # export CC=clang CXX=clang export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.3 +export PHP_LATEST_VERSION=8.2.4 ################################################################################ for command in "$@" diff --git a/wsl/lnmp-wsl-builder-php-rhel b/wsl/lnmp-wsl-builder-php-rhel index fa7876505..676bfc005 100755 --- a/wsl/lnmp-wsl-builder-php-rhel +++ b/wsl/lnmp-wsl-builder-php-rhel @@ -56,7 +56,7 @@ export TZ=Asia/Shanghai # export CC=clang CXX=clang # export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.3 +export PHP_LATEST_VERSION=8.2.4 ################################################################################ # diff --git a/wsl/wsl.phpbuilder.Dockerfile b/wsl/wsl.phpbuilder.Dockerfile index e8c2de111..3db294015 100755 --- a/wsl/wsl.phpbuilder.Dockerfile +++ b/wsl/wsl.phpbuilder.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 COPY lnmp-wsl-builder-php /lnmp-wsl-builder-php.sh diff --git a/wsl/wsl.phpbuilder.rhel.Dockerfile b/wsl/wsl.phpbuilder.rhel.Dockerfile index d8e25c208..d39dbc3a7 100755 --- a/wsl/wsl.phpbuilder.rhel.Dockerfile +++ b/wsl/wsl.phpbuilder.rhel.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.3 +ARG PHP_VERSION=8.2.4 COPY lnmp-wsl-builder-php-rhel /lnmp-wsl-builder-php-rhel.sh From 1a28711af6ba66424159d26eb1c2bab79887d7bb Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 21 May 2023 17:26:50 +0800 Subject: [PATCH 05/42] remove send data Signed-off-by: Kang Huaishuai --- .env.example | 4 ---- README.cn.md | 6 ------ README.md | 6 ------ lnmp-docker | 20 -------------------- 4 files changed, 36 deletions(-) diff --git a/.env.example b/.env.example index 08fb686a7..6794bd5cd 100644 --- a/.env.example +++ b/.env.example @@ -45,10 +45,6 @@ LREW_INCLUDE="minio" ################################################################################ -# privacy info, please set true to help us improve - -DATA_COLLECTION=true - # [PCIT] LNMP_PCIT_PORT=10000 diff --git a/README.cn.md b/README.cn.md index 8a19ebe88..40acc919f 100644 --- a/README.cn.md +++ b/README.cn.md @@ -288,9 +288,3 @@ https://docs.lnmp.khs1994.com ## 赞助项目 请访问 [https://zan.khs1994.com](https://zan.khs1994.com) - -## 数据收集 - -本项目每日默认会将用户的系统和 IP 信息发送到数据收集服务器。建议用户保持开启状态来帮助提升本项目。 - -你可以通过在 `.env` 文件中设置 `DATA_COLLECTION=false` 来禁用数据收集服务。 diff --git a/README.md b/README.md index 92975faa2..dab2f603e 100644 --- a/README.md +++ b/README.md @@ -278,9 +278,3 @@ Please see [Contributing](CONTRIBUTING.md) ## Donate Please see [https://zan.khs1994.com](https://zan.khs1994.com) - -## Privacy - -We send OS type and IP data to us data collection server, please set true (default) to help us improve. - -You can edit `.env` file `DATA_COLLECTION=false` to disable it. diff --git a/lnmp-docker b/lnmp-docker index 8ffccd8e4..6712354d1 100755 --- a/lnmp-docker +++ b/lnmp-docker @@ -206,23 +206,6 @@ Donate https://zan.khs1994.com " } -_tongji(){ - if ! [ -f log/tongji.txt ];then - print_info "Send OS type and IP data to khs1994-docker/lnmp, Thanks you help us improve" - if [ -f /etc/os-release ];then . /etc/os-release ; fi - curl -s -X GET --user-agent "${OS:-unkown os}-${ID:-unknow id}-${VERSION:-unkown version}" https://developer.khs1994.com/lnmp/tongji --connect-timeout 5 > /dev/null || echo 'ERROR=true' > log/tongji.txt - TIMESTAMP=`date +%s` - echo "TIMESTAMP=${TIMESTAMP}" > log/tongji.txt - else - . ./log/tongji.txt - - if [ `date +%s` -gt $((TIMESTAMP + 86400)) ];then - rm -rf log/tongji.txt - _tongji - fi - fi -} - test -f cluster/help.sh && source cluster/help.sh || true # composer satis @@ -1617,9 +1600,6 @@ set -e print_info $(docker compose version) -# data collaction -if ! [ "${DATA_COLLECTION}" = "false" ];then _tongji; fi - # output help if [ $# = 0 ];then help; exit 0; fi From 40718e51a222b4d8615fd701d172cc132d4a6394 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 10 Jun 2023 18:19:42 +0800 Subject: [PATCH 06/42] [Kubernetes] Update cli help info v1.27.0 Signed-off-by: Kang Huaishuai --- kubernetes/cli/docker.txt | 5 +- kubernetes/cli/kube-apiserver.txt | 267 +++++++++++---------- kubernetes/cli/kube-controller-manager.txt | 67 +++--- kubernetes/cli/kube-proxy.txt | 66 ++--- kubernetes/cli/kube-scheduler.txt | 65 ++--- kubernetes/cli/kubelet.txt | 89 +++---- 6 files changed, 298 insertions(+), 261 deletions(-) diff --git a/kubernetes/cli/docker.txt b/kubernetes/cli/docker.txt index be97fbfd9..93d96ba94 100644 --- a/kubernetes/cli/docker.txt +++ b/kubernetes/cli/docker.txt @@ -27,9 +27,9 @@ Options: Management Commands: app* Docker App (Docker Inc., v0.9.1-beta3) builder Manage builds - buildx* Docker Buildx (Docker Inc., v0.10.0-docker) + buildx* Docker Buildx (Docker Inc., v0.10.4-docker) checkpoint Manage checkpoints - compose* Docker Compose (Docker Inc., v2.16.0) + compose* Docker Compose (Docker Inc., v2.17.2) config Manage Docker configs container Manage containers context Manage contexts @@ -38,7 +38,6 @@ Management Commands: network Manage networks node Manage Swarm nodes plugin Manage plugins - scan* Docker Scan (Docker Inc., v0.23.0) secret Manage Docker secrets service Manage services stack Manage Docker stacks diff --git a/kubernetes/cli/kube-apiserver.txt b/kubernetes/cli/kube-apiserver.txt index 6fb0d5950..d5f427156 100644 --- a/kubernetes/cli/kube-apiserver.txt +++ b/kubernetes/cli/kube-apiserver.txt @@ -8,130 +8,138 @@ Usage: Generic flags: - --advertise-address ip The IP address on which to advertise the apiserver to members of the cluster. This address must be reachable by the rest of the cluster. If blank, the --bind-address will be used. If --bind-address is unspecified, the host's default interface will be used. - --cloud-provider-gce-l7lb-src-cidrs cidrs CIDRs opened in GCE firewall for L7 LB traffic proxy & health checks (default 130.211.0.0/22,35.191.0.0/16) - --cors-allowed-origins strings List of allowed origins for CORS, comma separated. An allowed origin can be a regular expression to support subdomain matching. If this list is empty CORS will not be enabled. - --default-not-ready-toleration-seconds int Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300) - --default-unreachable-toleration-seconds int Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300) - --enable-priority-and-fairness If true and the APIPriorityAndFairness feature gate is enabled, replace the max-in-flight handler with an enhanced one that queues and dispatches with priority and fairness (default true) - --external-hostname string The hostname to use when generating externalized URLs for this master (e.g. Swagger API Docs or OpenID Discovery). - --feature-gates mapStringBool A set of key=value pairs that describe feature gates for alpha/experimental features. Options are: - APIListChunking=true|false (BETA - default=true) - APIPriorityAndFairness=true|false (BETA - default=true) - APIResponseCompression=true|false (BETA - default=true) - APISelfSubjectReview=true|false (ALPHA - default=false) - APIServerIdentity=true|false (BETA - default=true) - APIServerTracing=true|false (ALPHA - default=false) - AggregatedDiscoveryEndpoint=true|false (ALPHA - default=false) - AllAlpha=true|false (ALPHA - default=false) - AllBeta=true|false (BETA - default=false) - AnyVolumeDataSource=true|false (BETA - default=true) - AppArmor=true|false (BETA - default=true) - CPUManagerPolicyAlphaOptions=true|false (ALPHA - default=false) - CPUManagerPolicyBetaOptions=true|false (BETA - default=true) - CPUManagerPolicyOptions=true|false (BETA - default=true) - CSIMigrationPortworx=true|false (BETA - default=false) - CSIMigrationRBD=true|false (ALPHA - default=false) - CSINodeExpandSecret=true|false (ALPHA - default=false) - CSIVolumeHealth=true|false (ALPHA - default=false) - ComponentSLIs=true|false (ALPHA - default=false) - ContainerCheckpoint=true|false (ALPHA - default=false) - ContextualLogging=true|false (ALPHA - default=false) - CronJobTimeZone=true|false (BETA - default=true) - CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) - CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) - CustomResourceValidationExpressions=true|false (BETA - default=true) - DisableCloudProviders=true|false (ALPHA - default=false) - DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) - DownwardAPIHugePages=true|false (BETA - default=true) - DynamicResourceAllocation=true|false (ALPHA - default=false) - EventedPLEG=true|false (ALPHA - default=false) - ExpandedDNSConfig=true|false (BETA - default=true) - ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) - GRPCContainerProbe=true|false (BETA - default=true) - GracefulNodeShutdown=true|false (BETA - default=true) - GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) - HPAContainerMetrics=true|false (ALPHA - default=false) - HPAScaleToZero=true|false (ALPHA - default=false) - HonorPVReclaimPolicy=true|false (ALPHA - default=false) - IPTablesOwnershipCleanup=true|false (ALPHA - default=false) - InTreePluginAWSUnregister=true|false (ALPHA - default=false) - InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) - InTreePluginAzureFileUnregister=true|false (ALPHA - default=false) - InTreePluginGCEUnregister=true|false (ALPHA - default=false) - InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) - InTreePluginPortworxUnregister=true|false (ALPHA - default=false) - InTreePluginRBDUnregister=true|false (ALPHA - default=false) - InTreePluginvSphereUnregister=true|false (ALPHA - default=false) - JobMutableNodeSchedulingDirectives=true|false (BETA - default=true) - JobPodFailurePolicy=true|false (BETA - default=true) - JobReadyPods=true|false (BETA - default=true) - KMSv2=true|false (ALPHA - default=false) - KubeletInUserNamespace=true|false (ALPHA - default=false) - KubeletPodResources=true|false (BETA - default=true) - KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) - KubeletTracing=true|false (ALPHA - default=false) - LegacyServiceAccountTokenTracking=true|false (ALPHA - default=false) - LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) - LogarithmicScaleDown=true|false (BETA - default=true) - LoggingAlphaOptions=true|false (ALPHA - default=false) - LoggingBetaOptions=true|false (BETA - default=true) - MatchLabelKeysInPodTopologySpread=true|false (ALPHA - default=false) - MaxUnavailableStatefulSet=true|false (ALPHA - default=false) - MemoryManager=true|false (BETA - default=true) - MemoryQoS=true|false (ALPHA - default=false) - MinDomainsInPodTopologySpread=true|false (BETA - default=false) - MinimizeIPTablesRestore=true|false (ALPHA - default=false) - MultiCIDRRangeAllocator=true|false (ALPHA - default=false) - NetworkPolicyStatus=true|false (ALPHA - default=false) - NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) - NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) - NodeSwap=true|false (ALPHA - default=false) - OpenAPIEnums=true|false (BETA - default=true) - OpenAPIV3=true|false (BETA - default=true) - PDBUnhealthyPodEvictionPolicy=true|false (ALPHA - default=false) - PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) - PodDeletionCost=true|false (BETA - default=true) - PodDisruptionConditions=true|false (BETA - default=true) - PodHasNetworkCondition=true|false (ALPHA - default=false) - PodSchedulingReadiness=true|false (ALPHA - default=false) - ProbeTerminationGracePeriod=true|false (BETA - default=true) - ProcMountType=true|false (ALPHA - default=false) - ProxyTerminatingEndpoints=true|false (BETA - default=true) - QOSReserved=true|false (ALPHA - default=false) - ReadWriteOncePod=true|false (ALPHA - default=false) - RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) - RemainingItemCount=true|false (BETA - default=true) - RetroactiveDefaultStorageClass=true|false (BETA - default=true) - RotateKubeletServerCertificate=true|false (BETA - default=true) - SELinuxMountReadWriteOncePod=true|false (ALPHA - default=false) - SeccompDefault=true|false (BETA - default=true) - ServerSideFieldValidation=true|false (BETA - default=true) - SizeMemoryBackedVolumes=true|false (BETA - default=true) - StatefulSetAutoDeletePVC=true|false (ALPHA - default=false) - StatefulSetStartOrdinal=true|false (ALPHA - default=false) - StorageVersionAPI=true|false (ALPHA - default=false) - StorageVersionHash=true|false (BETA - default=true) - TopologyAwareHints=true|false (BETA - default=true) - TopologyManager=true|false (BETA - default=true) - TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) - TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) - TopologyManagerPolicyOptions=true|false (ALPHA - default=false) - UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) - ValidatingAdmissionPolicy=true|false (ALPHA - default=false) - VolumeCapacityPriority=true|false (ALPHA - default=false) - WinDSR=true|false (ALPHA - default=false) - WinOverlay=true|false (BETA - default=true) - WindowsHostNetwork=true|false (ALPHA - default=true) - --goaway-chance float To prevent HTTP/2 clients from getting stuck on a single apiserver, randomly close a connection (GOAWAY). The client's other in-flight requests won't be affected, and the client will reconnect, likely landing on a different apiserver after going through the load balancer again. This argument sets the fraction of requests that will be sent a GOAWAY. Clusters with single apiservers, or which don't use a load balancer, should NOT enable this. Min is 0 (off), Max is .02 (1/50 requests); .001 (1/1000) is a recommended starting point. - --livez-grace-period duration This option represents the maximum amount of time it should take for apiserver to complete its startup sequence and become live. From apiserver's start time to when this amount of time has elapsed, /livez will assume that unfinished post-start hooks will complete successfully and therefore return true. - --max-mutating-requests-inflight int This and --max-requests-inflight are summed to determine the server's total concurrency limit (which must be positive) if --enable-priority-and-fairness is true. Otherwise, this flag limits the maximum number of mutating requests in flight, or a zero value disables the limit completely. (default 200) - --max-requests-inflight int This and --max-mutating-requests-inflight are summed to determine the server's total concurrency limit (which must be positive) if --enable-priority-and-fairness is true. Otherwise, this flag limits the maximum number of non-mutating requests in flight, or a zero value disables the limit completely. (default 400) - --min-request-timeout int An optional field indicating the minimum number of seconds a handler must keep a request open before timing it out. Currently only honored by the watch request handler, which picks a randomized value above this number as the connection timeout, to spread out load. (default 1800) - --request-timeout duration An optional field indicating the duration a handler must keep a request open before timing it out. This is the default request timeout for requests but may be overridden by flags such as --min-request-timeout for specific types of requests. (default 1m0s) - --shutdown-delay-duration duration Time to delay the termination. During that time the server keeps serving requests normally. The endpoints /healthz and /livez will return success, but /readyz immediately returns failure. Graceful termination starts after this delay has elapsed. This can be used to allow load balancer to stop sending traffic to this server. - --shutdown-send-retry-after If true the HTTP Server will continue listening until all non long running request(s) in flight have been drained, during this window all incoming requests will be rejected with a status code 429 and a 'Retry-After' response header, in addition 'Connection: close' response header is set in order to tear down the TCP connection when idle. - --strict-transport-security-directives strings List of directives for HSTS, comma separated. If this list is empty, then HSTS directives will not be added. Example: 'max-age=31536000,includeSubDomains,preload' + --advertise-address ip The IP address on which to advertise the apiserver to members of the cluster. This address must be reachable by the rest of the cluster. If blank, the --bind-address will be used. If --bind-address is unspecified, the host's default interface will be used. + --cloud-provider-gce-l7lb-src-cidrs cidrs CIDRs opened in GCE firewall for L7 LB traffic proxy & health checks (default 130.211.0.0/22,35.191.0.0/16) + --cors-allowed-origins strings List of allowed origins for CORS, comma separated. An allowed origin can be a regular expression to support subdomain matching. If this list is empty CORS will not be enabled. Please ensure each expression matches the entire hostname by anchoring to the start with '^' or including the '//' prefix, and by anchoring to the end with '$' or including the ':' port separator suffix. Examples of valid expressions are '//example\.com(:|$)' and '^https://example\.com(:|$)' + --default-not-ready-toleration-seconds int Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300) + --default-unreachable-toleration-seconds int Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300) + --enable-priority-and-fairness If true and the APIPriorityAndFairness feature gate is enabled, replace the max-in-flight handler with an enhanced one that queues and dispatches with priority and fairness (default true) + --external-hostname string The hostname to use when generating externalized URLs for this master (e.g. Swagger API Docs or OpenID Discovery). + --feature-gates mapStringBool A set of key=value pairs that describe feature gates for alpha/experimental features. Options are: + APIListChunking=true|false (BETA - default=true) + APIPriorityAndFairness=true|false (BETA - default=true) + APIResponseCompression=true|false (BETA - default=true) + APISelfSubjectReview=true|false (BETA - default=true) + APIServerIdentity=true|false (BETA - default=true) + APIServerTracing=true|false (BETA - default=true) + AdmissionWebhookMatchConditions=true|false (ALPHA - default=false) + AggregatedDiscoveryEndpoint=true|false (BETA - default=true) + AllAlpha=true|false (ALPHA - default=false) + AllBeta=true|false (BETA - default=false) + AnyVolumeDataSource=true|false (BETA - default=true) + AppArmor=true|false (BETA - default=true) + CPUManagerPolicyAlphaOptions=true|false (ALPHA - default=false) + CPUManagerPolicyBetaOptions=true|false (BETA - default=true) + CPUManagerPolicyOptions=true|false (BETA - default=true) + CSIMigrationPortworx=true|false (BETA - default=false) + CSIMigrationRBD=true|false (ALPHA - default=false) + CSINodeExpandSecret=true|false (BETA - default=true) + CSIVolumeHealth=true|false (ALPHA - default=false) + CloudControllerManagerWebhook=true|false (ALPHA - default=false) + CloudDualStackNodeIPs=true|false (ALPHA - default=false) + ClusterTrustBundle=true|false (ALPHA - default=false) + ComponentSLIs=true|false (BETA - default=true) + ContainerCheckpoint=true|false (ALPHA - default=false) + ContextualLogging=true|false (ALPHA - default=false) + CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) + CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) + CustomResourceValidationExpressions=true|false (BETA - default=true) + DisableCloudProviders=true|false (ALPHA - default=false) + DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) + DynamicResourceAllocation=true|false (ALPHA - default=false) + ElasticIndexedJob=true|false (BETA - default=true) + EventedPLEG=true|false (BETA - default=false) + ExpandedDNSConfig=true|false (BETA - default=true) + ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) + GracefulNodeShutdown=true|false (BETA - default=true) + GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) + HPAContainerMetrics=true|false (BETA - default=true) + HPAScaleToZero=true|false (ALPHA - default=false) + HonorPVReclaimPolicy=true|false (ALPHA - default=false) + IPTablesOwnershipCleanup=true|false (BETA - default=true) + InPlacePodVerticalScaling=true|false (ALPHA - default=false) + InTreePluginAWSUnregister=true|false (ALPHA - default=false) + InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) + InTreePluginAzureFileUnregister=true|false (ALPHA - default=false) + InTreePluginGCEUnregister=true|false (ALPHA - default=false) + InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) + InTreePluginPortworxUnregister=true|false (ALPHA - default=false) + InTreePluginRBDUnregister=true|false (ALPHA - default=false) + InTreePluginvSphereUnregister=true|false (ALPHA - default=false) + JobPodFailurePolicy=true|false (BETA - default=true) + JobReadyPods=true|false (BETA - default=true) + KMSv2=true|false (BETA - default=true) + KubeletInUserNamespace=true|false (ALPHA - default=false) + KubeletPodResources=true|false (BETA - default=true) + KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) + KubeletPodResourcesGet=true|false (ALPHA - default=false) + KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) + KubeletTracing=true|false (BETA - default=true) + LegacyServiceAccountTokenTracking=true|false (BETA - default=true) + LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) + LogarithmicScaleDown=true|false (BETA - default=true) + LoggingAlphaOptions=true|false (ALPHA - default=false) + LoggingBetaOptions=true|false (BETA - default=true) + MatchLabelKeysInPodTopologySpread=true|false (BETA - default=true) + MaxUnavailableStatefulSet=true|false (ALPHA - default=false) + MemoryManager=true|false (BETA - default=true) + MemoryQoS=true|false (ALPHA - default=false) + MinDomainsInPodTopologySpread=true|false (BETA - default=true) + MinimizeIPTablesRestore=true|false (BETA - default=true) + MultiCIDRRangeAllocator=true|false (ALPHA - default=false) + MultiCIDRServiceAllocator=true|false (ALPHA - default=false) + NetworkPolicyStatus=true|false (ALPHA - default=false) + NewVolumeManagerReconstruction=true|false (BETA - default=true) + NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) + NodeLogQuery=true|false (ALPHA - default=false) + NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) + NodeSwap=true|false (ALPHA - default=false) + OpenAPIEnums=true|false (BETA - default=true) + PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) + PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) + PodDeletionCost=true|false (BETA - default=true) + PodDisruptionConditions=true|false (BETA - default=true) + PodHasNetworkCondition=true|false (ALPHA - default=false) + PodSchedulingReadiness=true|false (BETA - default=true) + ProbeTerminationGracePeriod=true|false (BETA - default=true) + ProcMountType=true|false (ALPHA - default=false) + ProxyTerminatingEndpoints=true|false (BETA - default=true) + QOSReserved=true|false (ALPHA - default=false) + ReadWriteOncePod=true|false (BETA - default=true) + RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) + RemainingItemCount=true|false (BETA - default=true) + RetroactiveDefaultStorageClass=true|false (BETA - default=true) + RotateKubeletServerCertificate=true|false (BETA - default=true) + SELinuxMountReadWriteOncePod=true|false (BETA - default=true) + SecurityContextDeny=true|false (ALPHA - default=false) + ServiceNodePortStaticSubrange=true|false (ALPHA - default=false) + SizeMemoryBackedVolumes=true|false (BETA - default=true) + StableLoadBalancerNodeSet=true|false (BETA - default=true) + StatefulSetAutoDeletePVC=true|false (BETA - default=true) + StatefulSetStartOrdinal=true|false (BETA - default=true) + StorageVersionAPI=true|false (ALPHA - default=false) + StorageVersionHash=true|false (BETA - default=true) + TopologyAwareHints=true|false (BETA - default=true) + TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) + TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) + TopologyManagerPolicyOptions=true|false (ALPHA - default=false) + UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) + ValidatingAdmissionPolicy=true|false (ALPHA - default=false) + VolumeCapacityPriority=true|false (ALPHA - default=false) + WatchList=true|false (ALPHA - default=false) + WinDSR=true|false (ALPHA - default=false) + WinOverlay=true|false (BETA - default=true) + WindowsHostNetwork=true|false (ALPHA - default=true) + --goaway-chance float To prevent HTTP/2 clients from getting stuck on a single apiserver, randomly close a connection (GOAWAY). The client's other in-flight requests won't be affected, and the client will reconnect, likely landing on a different apiserver after going through the load balancer again. This argument sets the fraction of requests that will be sent a GOAWAY. Clusters with single apiservers, or which don't use a load balancer, should NOT enable this. Min is 0 (off), Max is .02 (1/50 requests); .001 (1/1000) is a recommended starting point. + --livez-grace-period duration This option represents the maximum amount of time it should take for apiserver to complete its startup sequence and become live. From apiserver's start time to when this amount of time has elapsed, /livez will assume that unfinished post-start hooks will complete successfully and therefore return true. + --max-mutating-requests-inflight int This and --max-requests-inflight are summed to determine the server's total concurrency limit (which must be positive) if --enable-priority-and-fairness is true. Otherwise, this flag limits the maximum number of mutating requests in flight, or a zero value disables the limit completely. (default 200) + --max-requests-inflight int This and --max-mutating-requests-inflight are summed to determine the server's total concurrency limit (which must be positive) if --enable-priority-and-fairness is true. Otherwise, this flag limits the maximum number of non-mutating requests in flight, or a zero value disables the limit completely. (default 400) + --min-request-timeout int An optional field indicating the minimum number of seconds a handler must keep a request open before timing it out. Currently only honored by the watch request handler, which picks a randomized value above this number as the connection timeout, to spread out load. (default 1800) + --request-timeout duration An optional field indicating the duration a handler must keep a request open before timing it out. This is the default request timeout for requests but may be overridden by flags such as --min-request-timeout for specific types of requests. (default 1m0s) + --shutdown-delay-duration duration Time to delay the termination. During that time the server keeps serving requests normally. The endpoints /healthz and /livez will return success, but /readyz immediately returns failure. Graceful termination starts after this delay has elapsed. This can be used to allow load balancer to stop sending traffic to this server. + --shutdown-send-retry-after If true the HTTP Server will continue listening until all non long running request(s) in flight have been drained, during this window all incoming requests will be rejected with a status code 429 and a 'Retry-After' response header, in addition 'Connection: close' response header is set in order to tear down the TCP connection when idle. + --shutdown-watch-termination-grace-period duration This option, if set, represents the maximum amount of grace period the apiserver will wait for active watch request(s) to drain during the graceful server shutdown window. + --strict-transport-security-directives strings List of directives for HSTS, comma separated. If this list is empty, then HSTS directives will not be added. Example: 'max-age=31536000,includeSubDomains,preload' Etcd flags: @@ -208,8 +216,9 @@ Auditing flags: Features flags: - --contention-profiling Enable lock contention profiling, if profiling is enabled - --profiling Enable profiling via web interface host:port/debug/pprof/ (default true) + --contention-profiling Enable block profiling, if profiling is enabled + --debug-socket-path string Use an unprotected (no authn/authz) unix-domain socket for profiling with the given path + --profiling Enable profiling via web interface host:port/debug/pprof/ (default true) Authentication flags: @@ -273,10 +282,10 @@ Egress selector flags: Admission flags: - --admission-control strings Admission is divided into two phases. In the first phase, only mutating admission plugins run. In the second phase, only validating admission plugins run. The names in the below list may represent a validating plugin, a mutating plugin, or both. The order of plugins in which they are passed to this flag does not matter. Comma-delimited list of: AlwaysAdmit, AlwaysDeny, AlwaysPullImages, CertificateApproval, CertificateSigning, CertificateSubjectRestriction, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, DenyServiceExternalIPs, EventRateLimit, ExtendedResourceToleration, ImagePolicyWebhook, LimitPodHardAntiAffinityTopology, LimitRanger, MutatingAdmissionWebhook, NamespaceAutoProvision, NamespaceExists, NamespaceLifecycle, NodeRestriction, OwnerReferencesPermissionEnforcement, PersistentVolumeClaimResize, PersistentVolumeLabel, PodNodeSelector, PodSecurity, PodTolerationRestriction, Priority, ResourceQuota, RuntimeClass, SecurityContextDeny, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionPolicy, ValidatingAdmissionWebhook. (DEPRECATED: Use --enable-admission-plugins or --disable-admission-plugins instead. Will be removed in a future version.) + --admission-control strings Admission is divided into two phases. In the first phase, only mutating admission plugins run. In the second phase, only validating admission plugins run. The names in the below list may represent a validating plugin, a mutating plugin, or both. The order of plugins in which they are passed to this flag does not matter. Comma-delimited list of: AlwaysAdmit, AlwaysDeny, AlwaysPullImages, CertificateApproval, CertificateSigning, CertificateSubjectRestriction, ClusterTrustBundleAttest, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, DenyServiceExternalIPs, EventRateLimit, ExtendedResourceToleration, ImagePolicyWebhook, LimitPodHardAntiAffinityTopology, LimitRanger, MutatingAdmissionWebhook, NamespaceAutoProvision, NamespaceExists, NamespaceLifecycle, NodeRestriction, OwnerReferencesPermissionEnforcement, PersistentVolumeClaimResize, PersistentVolumeLabel, PodNodeSelector, PodSecurity, PodTolerationRestriction, Priority, ResourceQuota, RuntimeClass, SecurityContextDeny, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionPolicy, ValidatingAdmissionWebhook. (DEPRECATED: Use --enable-admission-plugins or --disable-admission-plugins instead. Will be removed in a future version.) --admission-control-config-file string File with admission control configuration. - --disable-admission-plugins strings admission plugins that should be disabled although they are in the default enabled plugins list (NamespaceLifecycle, LimitRanger, ServiceAccount, TaintNodesByCondition, PodSecurity, Priority, DefaultTolerationSeconds, DefaultStorageClass, StorageObjectInUseProtection, PersistentVolumeClaimResize, RuntimeClass, CertificateApproval, CertificateSigning, CertificateSubjectRestriction, DefaultIngressClass, MutatingAdmissionWebhook, ValidatingAdmissionPolicy, ValidatingAdmissionWebhook, ResourceQuota). Comma-delimited list of admission plugins: AlwaysAdmit, AlwaysDeny, AlwaysPullImages, CertificateApproval, CertificateSigning, CertificateSubjectRestriction, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, DenyServiceExternalIPs, EventRateLimit, ExtendedResourceToleration, ImagePolicyWebhook, LimitPodHardAntiAffinityTopology, LimitRanger, MutatingAdmissionWebhook, NamespaceAutoProvision, NamespaceExists, NamespaceLifecycle, NodeRestriction, OwnerReferencesPermissionEnforcement, PersistentVolumeClaimResize, PersistentVolumeLabel, PodNodeSelector, PodSecurity, PodTolerationRestriction, Priority, ResourceQuota, RuntimeClass, SecurityContextDeny, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionPolicy, ValidatingAdmissionWebhook. The order of plugins in this flag does not matter. - --enable-admission-plugins strings admission plugins that should be enabled in addition to default enabled ones (NamespaceLifecycle, LimitRanger, ServiceAccount, TaintNodesByCondition, PodSecurity, Priority, DefaultTolerationSeconds, DefaultStorageClass, StorageObjectInUseProtection, PersistentVolumeClaimResize, RuntimeClass, CertificateApproval, CertificateSigning, CertificateSubjectRestriction, DefaultIngressClass, MutatingAdmissionWebhook, ValidatingAdmissionPolicy, ValidatingAdmissionWebhook, ResourceQuota). Comma-delimited list of admission plugins: AlwaysAdmit, AlwaysDeny, AlwaysPullImages, CertificateApproval, CertificateSigning, CertificateSubjectRestriction, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, DenyServiceExternalIPs, EventRateLimit, ExtendedResourceToleration, ImagePolicyWebhook, LimitPodHardAntiAffinityTopology, LimitRanger, MutatingAdmissionWebhook, NamespaceAutoProvision, NamespaceExists, NamespaceLifecycle, NodeRestriction, OwnerReferencesPermissionEnforcement, PersistentVolumeClaimResize, PersistentVolumeLabel, PodNodeSelector, PodSecurity, PodTolerationRestriction, Priority, ResourceQuota, RuntimeClass, SecurityContextDeny, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionPolicy, ValidatingAdmissionWebhook. The order of plugins in this flag does not matter. + --disable-admission-plugins strings admission plugins that should be disabled although they are in the default enabled plugins list (NamespaceLifecycle, LimitRanger, ServiceAccount, TaintNodesByCondition, PodSecurity, Priority, DefaultTolerationSeconds, DefaultStorageClass, StorageObjectInUseProtection, PersistentVolumeClaimResize, RuntimeClass, CertificateApproval, CertificateSigning, ClusterTrustBundleAttest, CertificateSubjectRestriction, DefaultIngressClass, MutatingAdmissionWebhook, ValidatingAdmissionPolicy, ValidatingAdmissionWebhook, ResourceQuota). Comma-delimited list of admission plugins: AlwaysAdmit, AlwaysDeny, AlwaysPullImages, CertificateApproval, CertificateSigning, CertificateSubjectRestriction, ClusterTrustBundleAttest, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, DenyServiceExternalIPs, EventRateLimit, ExtendedResourceToleration, ImagePolicyWebhook, LimitPodHardAntiAffinityTopology, LimitRanger, MutatingAdmissionWebhook, NamespaceAutoProvision, NamespaceExists, NamespaceLifecycle, NodeRestriction, OwnerReferencesPermissionEnforcement, PersistentVolumeClaimResize, PersistentVolumeLabel, PodNodeSelector, PodSecurity, PodTolerationRestriction, Priority, ResourceQuota, RuntimeClass, SecurityContextDeny, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionPolicy, ValidatingAdmissionWebhook. The order of plugins in this flag does not matter. + --enable-admission-plugins strings admission plugins that should be enabled in addition to default enabled ones (NamespaceLifecycle, LimitRanger, ServiceAccount, TaintNodesByCondition, PodSecurity, Priority, DefaultTolerationSeconds, DefaultStorageClass, StorageObjectInUseProtection, PersistentVolumeClaimResize, RuntimeClass, CertificateApproval, CertificateSigning, ClusterTrustBundleAttest, CertificateSubjectRestriction, DefaultIngressClass, MutatingAdmissionWebhook, ValidatingAdmissionPolicy, ValidatingAdmissionWebhook, ResourceQuota). Comma-delimited list of admission plugins: AlwaysAdmit, AlwaysDeny, AlwaysPullImages, CertificateApproval, CertificateSigning, CertificateSubjectRestriction, ClusterTrustBundleAttest, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, DenyServiceExternalIPs, EventRateLimit, ExtendedResourceToleration, ImagePolicyWebhook, LimitPodHardAntiAffinityTopology, LimitRanger, MutatingAdmissionWebhook, NamespaceAutoProvision, NamespaceExists, NamespaceLifecycle, NodeRestriction, OwnerReferencesPermissionEnforcement, PersistentVolumeClaimResize, PersistentVolumeLabel, PodNodeSelector, PodSecurity, PodTolerationRestriction, Priority, ResourceQuota, RuntimeClass, SecurityContextDeny, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionPolicy, ValidatingAdmissionWebhook. The order of plugins in this flag does not matter. Metrics flags: diff --git a/kubernetes/cli/kube-controller-manager.txt b/kubernetes/cli/kube-controller-manager.txt index 972e02a07..88f9b7b9e 100644 --- a/kubernetes/cli/kube-controller-manager.txt +++ b/kubernetes/cli/kube-controller-manager.txt @@ -12,7 +12,7 @@ Usage: Debugging flags: - --contention-profiling Enable lock contention profiling, if profiling is enabled + --contention-profiling Enable block profiling, if profiling is enabled --profiling Enable profiling via web interface host:port/debug/pprof/ (default true) Leader-migration flags: @@ -38,10 +38,11 @@ Generic flags: APIListChunking=true|false (BETA - default=true) APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) - APISelfSubjectReview=true|false (ALPHA - default=false) + APISelfSubjectReview=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) - APIServerTracing=true|false (ALPHA - default=false) - AggregatedDiscoveryEndpoint=true|false (ALPHA - default=false) + APIServerTracing=true|false (BETA - default=true) + AdmissionWebhookMatchConditions=true|false (ALPHA - default=false) + AggregatedDiscoveryEndpoint=true|false (BETA - default=true) AllAlpha=true|false (ALPHA - default=false) AllBeta=true|false (BETA - default=false) AnyVolumeDataSource=true|false (BETA - default=true) @@ -51,29 +52,31 @@ Generic flags: CPUManagerPolicyOptions=true|false (BETA - default=true) CSIMigrationPortworx=true|false (BETA - default=false) CSIMigrationRBD=true|false (ALPHA - default=false) - CSINodeExpandSecret=true|false (ALPHA - default=false) + CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) - ComponentSLIs=true|false (ALPHA - default=false) + CloudControllerManagerWebhook=true|false (ALPHA - default=false) + CloudDualStackNodeIPs=true|false (ALPHA - default=false) + ClusterTrustBundle=true|false (ALPHA - default=false) + ComponentSLIs=true|false (BETA - default=true) ContainerCheckpoint=true|false (ALPHA - default=false) ContextualLogging=true|false (ALPHA - default=false) - CronJobTimeZone=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) CustomResourceValidationExpressions=true|false (BETA - default=true) DisableCloudProviders=true|false (ALPHA - default=false) DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) - DownwardAPIHugePages=true|false (BETA - default=true) DynamicResourceAllocation=true|false (ALPHA - default=false) - EventedPLEG=true|false (ALPHA - default=false) + ElasticIndexedJob=true|false (BETA - default=true) + EventedPLEG=true|false (BETA - default=false) ExpandedDNSConfig=true|false (BETA - default=true) ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) - GRPCContainerProbe=true|false (BETA - default=true) GracefulNodeShutdown=true|false (BETA - default=true) GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) - HPAContainerMetrics=true|false (ALPHA - default=false) + HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) - IPTablesOwnershipCleanup=true|false (ALPHA - default=false) + IPTablesOwnershipCleanup=true|false (BETA - default=true) + InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) InTreePluginAzureFileUnregister=true|false (ALPHA - default=false) @@ -82,63 +85,67 @@ Generic flags: InTreePluginPortworxUnregister=true|false (ALPHA - default=false) InTreePluginRBDUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) - JobMutableNodeSchedulingDirectives=true|false (BETA - default=true) JobPodFailurePolicy=true|false (BETA - default=true) JobReadyPods=true|false (BETA - default=true) - KMSv2=true|false (ALPHA - default=false) + KMSv2=true|false (BETA - default=true) KubeletInUserNamespace=true|false (ALPHA - default=false) KubeletPodResources=true|false (BETA - default=true) + KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) + KubeletPodResourcesGet=true|false (ALPHA - default=false) KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) - KubeletTracing=true|false (ALPHA - default=false) - LegacyServiceAccountTokenTracking=true|false (ALPHA - default=false) + KubeletTracing=true|false (BETA - default=true) + LegacyServiceAccountTokenTracking=true|false (BETA - default=true) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) LoggingBetaOptions=true|false (BETA - default=true) - MatchLabelKeysInPodTopologySpread=true|false (ALPHA - default=false) + MatchLabelKeysInPodTopologySpread=true|false (BETA - default=true) MaxUnavailableStatefulSet=true|false (ALPHA - default=false) MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) - MinDomainsInPodTopologySpread=true|false (BETA - default=false) - MinimizeIPTablesRestore=true|false (ALPHA - default=false) + MinDomainsInPodTopologySpread=true|false (BETA - default=true) + MinimizeIPTablesRestore=true|false (BETA - default=true) MultiCIDRRangeAllocator=true|false (ALPHA - default=false) + MultiCIDRServiceAllocator=true|false (ALPHA - default=false) NetworkPolicyStatus=true|false (ALPHA - default=false) + NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) + NodeLogQuery=true|false (ALPHA - default=false) NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) NodeSwap=true|false (ALPHA - default=false) OpenAPIEnums=true|false (BETA - default=true) - OpenAPIV3=true|false (BETA - default=true) - PDBUnhealthyPodEvictionPolicy=true|false (ALPHA - default=false) + PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) PodHasNetworkCondition=true|false (ALPHA - default=false) - PodSchedulingReadiness=true|false (ALPHA - default=false) + PodSchedulingReadiness=true|false (BETA - default=true) ProbeTerminationGracePeriod=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) ProxyTerminatingEndpoints=true|false (BETA - default=true) QOSReserved=true|false (ALPHA - default=false) - ReadWriteOncePod=true|false (ALPHA - default=false) + ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) RemainingItemCount=true|false (BETA - default=true) RetroactiveDefaultStorageClass=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) - SELinuxMountReadWriteOncePod=true|false (ALPHA - default=false) - SeccompDefault=true|false (BETA - default=true) - ServerSideFieldValidation=true|false (BETA - default=true) + SELinuxMountReadWriteOncePod=true|false (BETA - default=true) + SecurityContextDeny=true|false (ALPHA - default=false) + ServiceNodePortStaticSubrange=true|false (ALPHA - default=false) SizeMemoryBackedVolumes=true|false (BETA - default=true) - StatefulSetAutoDeletePVC=true|false (ALPHA - default=false) - StatefulSetStartOrdinal=true|false (ALPHA - default=false) + StableLoadBalancerNodeSet=true|false (BETA - default=true) + StatefulSetAutoDeletePVC=true|false (BETA - default=true) + StatefulSetStartOrdinal=true|false (BETA - default=true) StorageVersionAPI=true|false (ALPHA - default=false) StorageVersionHash=true|false (BETA - default=true) TopologyAwareHints=true|false (BETA - default=true) - TopologyManager=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) TopologyManagerPolicyOptions=true|false (ALPHA - default=false) UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) ValidatingAdmissionPolicy=true|false (ALPHA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) + WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) WinOverlay=true|false (BETA - default=true) WindowsHostNetwork=true|false (ALPHA - default=true) @@ -339,7 +346,7 @@ Logs flags: Misc flags: - --kubeconfig string Path to kubeconfig file with authorization and master location information. + --kubeconfig string Path to kubeconfig file with authorization and master location information (the master location can be overridden by the master flag). --master string The address of the Kubernetes API server (overrides any value in kubeconfig). Global flags: diff --git a/kubernetes/cli/kube-proxy.txt b/kubernetes/cli/kube-proxy.txt index 6dbaf3d91..c969a2836 100644 --- a/kubernetes/cli/kube-proxy.txt +++ b/kubernetes/cli/kube-proxy.txt @@ -26,10 +26,11 @@ Flags: APIListChunking=true|false (BETA - default=true) APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) - APISelfSubjectReview=true|false (ALPHA - default=false) + APISelfSubjectReview=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) - APIServerTracing=true|false (ALPHA - default=false) - AggregatedDiscoveryEndpoint=true|false (ALPHA - default=false) + APIServerTracing=true|false (BETA - default=true) + AdmissionWebhookMatchConditions=true|false (ALPHA - default=false) + AggregatedDiscoveryEndpoint=true|false (BETA - default=true) AllAlpha=true|false (ALPHA - default=false) AllBeta=true|false (BETA - default=false) AnyVolumeDataSource=true|false (BETA - default=true) @@ -39,28 +40,31 @@ Flags: CPUManagerPolicyOptions=true|false (BETA - default=true) CSIMigrationPortworx=true|false (BETA - default=false) CSIMigrationRBD=true|false (ALPHA - default=false) - CSINodeExpandSecret=true|false (ALPHA - default=false) + CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) - ComponentSLIs=true|false (ALPHA - default=false) + CloudControllerManagerWebhook=true|false (ALPHA - default=false) + CloudDualStackNodeIPs=true|false (ALPHA - default=false) + ClusterTrustBundle=true|false (ALPHA - default=false) + ComponentSLIs=true|false (BETA - default=true) ContainerCheckpoint=true|false (ALPHA - default=false) - CronJobTimeZone=true|false (BETA - default=true) + ContextualLogging=true|false (ALPHA - default=false) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) CustomResourceValidationExpressions=true|false (BETA - default=true) DisableCloudProviders=true|false (ALPHA - default=false) DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) - DownwardAPIHugePages=true|false (BETA - default=true) DynamicResourceAllocation=true|false (ALPHA - default=false) - EventedPLEG=true|false (ALPHA - default=false) + ElasticIndexedJob=true|false (BETA - default=true) + EventedPLEG=true|false (BETA - default=false) ExpandedDNSConfig=true|false (BETA - default=true) ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) - GRPCContainerProbe=true|false (BETA - default=true) GracefulNodeShutdown=true|false (BETA - default=true) GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) - HPAContainerMetrics=true|false (ALPHA - default=false) + HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) - IPTablesOwnershipCleanup=true|false (ALPHA - default=false) + IPTablesOwnershipCleanup=true|false (BETA - default=true) + InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) InTreePluginAzureFileUnregister=true|false (ALPHA - default=false) @@ -69,61 +73,67 @@ Flags: InTreePluginPortworxUnregister=true|false (ALPHA - default=false) InTreePluginRBDUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) - JobMutableNodeSchedulingDirectives=true|false (BETA - default=true) JobPodFailurePolicy=true|false (BETA - default=true) JobReadyPods=true|false (BETA - default=true) - KMSv2=true|false (ALPHA - default=false) + KMSv2=true|false (BETA - default=true) KubeletInUserNamespace=true|false (ALPHA - default=false) KubeletPodResources=true|false (BETA - default=true) + KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) + KubeletPodResourcesGet=true|false (ALPHA - default=false) KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) - KubeletTracing=true|false (ALPHA - default=false) - LegacyServiceAccountTokenTracking=true|false (ALPHA - default=false) + KubeletTracing=true|false (BETA - default=true) + LegacyServiceAccountTokenTracking=true|false (BETA - default=true) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) - MatchLabelKeysInPodTopologySpread=true|false (ALPHA - default=false) + LoggingAlphaOptions=true|false (ALPHA - default=false) + LoggingBetaOptions=true|false (BETA - default=true) + MatchLabelKeysInPodTopologySpread=true|false (BETA - default=true) MaxUnavailableStatefulSet=true|false (ALPHA - default=false) MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) - MinDomainsInPodTopologySpread=true|false (BETA - default=false) - MinimizeIPTablesRestore=true|false (ALPHA - default=false) + MinDomainsInPodTopologySpread=true|false (BETA - default=true) + MinimizeIPTablesRestore=true|false (BETA - default=true) MultiCIDRRangeAllocator=true|false (ALPHA - default=false) + MultiCIDRServiceAllocator=true|false (ALPHA - default=false) NetworkPolicyStatus=true|false (ALPHA - default=false) + NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) + NodeLogQuery=true|false (ALPHA - default=false) NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) NodeSwap=true|false (ALPHA - default=false) OpenAPIEnums=true|false (BETA - default=true) - OpenAPIV3=true|false (BETA - default=true) - PDBUnhealthyPodEvictionPolicy=true|false (ALPHA - default=false) + PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) PodHasNetworkCondition=true|false (ALPHA - default=false) - PodSchedulingReadiness=true|false (ALPHA - default=false) + PodSchedulingReadiness=true|false (BETA - default=true) ProbeTerminationGracePeriod=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) ProxyTerminatingEndpoints=true|false (BETA - default=true) QOSReserved=true|false (ALPHA - default=false) - ReadWriteOncePod=true|false (ALPHA - default=false) + ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) RemainingItemCount=true|false (BETA - default=true) RetroactiveDefaultStorageClass=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) - SELinuxMountReadWriteOncePod=true|false (ALPHA - default=false) - SeccompDefault=true|false (BETA - default=true) - ServerSideFieldValidation=true|false (BETA - default=true) + SELinuxMountReadWriteOncePod=true|false (BETA - default=true) + SecurityContextDeny=true|false (ALPHA - default=false) + ServiceNodePortStaticSubrange=true|false (ALPHA - default=false) SizeMemoryBackedVolumes=true|false (BETA - default=true) - StatefulSetAutoDeletePVC=true|false (ALPHA - default=false) - StatefulSetStartOrdinal=true|false (ALPHA - default=false) + StableLoadBalancerNodeSet=true|false (BETA - default=true) + StatefulSetAutoDeletePVC=true|false (BETA - default=true) + StatefulSetStartOrdinal=true|false (BETA - default=true) StorageVersionAPI=true|false (ALPHA - default=false) StorageVersionHash=true|false (BETA - default=true) TopologyAwareHints=true|false (BETA - default=true) - TopologyManager=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) TopologyManagerPolicyOptions=true|false (ALPHA - default=false) UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) ValidatingAdmissionPolicy=true|false (ALPHA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) + WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) WinOverlay=true|false (BETA - default=true) WindowsHostNetwork=true|false (ALPHA - default=true) diff --git a/kubernetes/cli/kube-scheduler.txt b/kubernetes/cli/kube-scheduler.txt index ee6c00bca..83738f5b6 100644 --- a/kubernetes/cli/kube-scheduler.txt +++ b/kubernetes/cli/kube-scheduler.txt @@ -54,7 +54,7 @@ Authorization flags: Deprecated flags: - --contention-profiling DEPRECATED: enable lock contention profiling, if profiling is enabled. This parameter is ignored if a config file is specified in --config. (default true) + --contention-profiling DEPRECATED: enable block profiling, if profiling is enabled. This parameter is ignored if a config file is specified in --config. (default true) --kube-api-burst int32 DEPRECATED: burst to use while talking with kubernetes apiserver. This parameter is ignored if a config file is specified in --config. (default 100) --kube-api-content-type string DEPRECATED: content type of requests sent to apiserver. This parameter is ignored if a config file is specified in --config. (default "application/vnd.kubernetes.protobuf") --kube-api-qps float32 DEPRECATED: QPS to use while talking with kubernetes apiserver. This parameter is ignored if a config file is specified in --config. (default 50) @@ -80,10 +80,11 @@ Feature gate flags: APIListChunking=true|false (BETA - default=true) APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) - APISelfSubjectReview=true|false (ALPHA - default=false) + APISelfSubjectReview=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) - APIServerTracing=true|false (ALPHA - default=false) - AggregatedDiscoveryEndpoint=true|false (ALPHA - default=false) + APIServerTracing=true|false (BETA - default=true) + AdmissionWebhookMatchConditions=true|false (ALPHA - default=false) + AggregatedDiscoveryEndpoint=true|false (BETA - default=true) AllAlpha=true|false (ALPHA - default=false) AllBeta=true|false (BETA - default=false) AnyVolumeDataSource=true|false (BETA - default=true) @@ -93,29 +94,31 @@ Feature gate flags: CPUManagerPolicyOptions=true|false (BETA - default=true) CSIMigrationPortworx=true|false (BETA - default=false) CSIMigrationRBD=true|false (ALPHA - default=false) - CSINodeExpandSecret=true|false (ALPHA - default=false) + CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) - ComponentSLIs=true|false (ALPHA - default=false) + CloudControllerManagerWebhook=true|false (ALPHA - default=false) + CloudDualStackNodeIPs=true|false (ALPHA - default=false) + ClusterTrustBundle=true|false (ALPHA - default=false) + ComponentSLIs=true|false (BETA - default=true) ContainerCheckpoint=true|false (ALPHA - default=false) ContextualLogging=true|false (ALPHA - default=false) - CronJobTimeZone=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) CustomResourceValidationExpressions=true|false (BETA - default=true) DisableCloudProviders=true|false (ALPHA - default=false) DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) - DownwardAPIHugePages=true|false (BETA - default=true) DynamicResourceAllocation=true|false (ALPHA - default=false) - EventedPLEG=true|false (ALPHA - default=false) + ElasticIndexedJob=true|false (BETA - default=true) + EventedPLEG=true|false (BETA - default=false) ExpandedDNSConfig=true|false (BETA - default=true) ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) - GRPCContainerProbe=true|false (BETA - default=true) GracefulNodeShutdown=true|false (BETA - default=true) GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) - HPAContainerMetrics=true|false (ALPHA - default=false) + HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) - IPTablesOwnershipCleanup=true|false (ALPHA - default=false) + IPTablesOwnershipCleanup=true|false (BETA - default=true) + InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) InTreePluginAzureFileUnregister=true|false (ALPHA - default=false) @@ -124,63 +127,67 @@ Feature gate flags: InTreePluginPortworxUnregister=true|false (ALPHA - default=false) InTreePluginRBDUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) - JobMutableNodeSchedulingDirectives=true|false (BETA - default=true) JobPodFailurePolicy=true|false (BETA - default=true) JobReadyPods=true|false (BETA - default=true) - KMSv2=true|false (ALPHA - default=false) + KMSv2=true|false (BETA - default=true) KubeletInUserNamespace=true|false (ALPHA - default=false) KubeletPodResources=true|false (BETA - default=true) + KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) + KubeletPodResourcesGet=true|false (ALPHA - default=false) KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) - KubeletTracing=true|false (ALPHA - default=false) - LegacyServiceAccountTokenTracking=true|false (ALPHA - default=false) + KubeletTracing=true|false (BETA - default=true) + LegacyServiceAccountTokenTracking=true|false (BETA - default=true) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) LoggingBetaOptions=true|false (BETA - default=true) - MatchLabelKeysInPodTopologySpread=true|false (ALPHA - default=false) + MatchLabelKeysInPodTopologySpread=true|false (BETA - default=true) MaxUnavailableStatefulSet=true|false (ALPHA - default=false) MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) - MinDomainsInPodTopologySpread=true|false (BETA - default=false) - MinimizeIPTablesRestore=true|false (ALPHA - default=false) + MinDomainsInPodTopologySpread=true|false (BETA - default=true) + MinimizeIPTablesRestore=true|false (BETA - default=true) MultiCIDRRangeAllocator=true|false (ALPHA - default=false) + MultiCIDRServiceAllocator=true|false (ALPHA - default=false) NetworkPolicyStatus=true|false (ALPHA - default=false) + NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) + NodeLogQuery=true|false (ALPHA - default=false) NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) NodeSwap=true|false (ALPHA - default=false) OpenAPIEnums=true|false (BETA - default=true) - OpenAPIV3=true|false (BETA - default=true) - PDBUnhealthyPodEvictionPolicy=true|false (ALPHA - default=false) + PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) PodHasNetworkCondition=true|false (ALPHA - default=false) - PodSchedulingReadiness=true|false (ALPHA - default=false) + PodSchedulingReadiness=true|false (BETA - default=true) ProbeTerminationGracePeriod=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) ProxyTerminatingEndpoints=true|false (BETA - default=true) QOSReserved=true|false (ALPHA - default=false) - ReadWriteOncePod=true|false (ALPHA - default=false) + ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) RemainingItemCount=true|false (BETA - default=true) RetroactiveDefaultStorageClass=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) - SELinuxMountReadWriteOncePod=true|false (ALPHA - default=false) - SeccompDefault=true|false (BETA - default=true) - ServerSideFieldValidation=true|false (BETA - default=true) + SELinuxMountReadWriteOncePod=true|false (BETA - default=true) + SecurityContextDeny=true|false (ALPHA - default=false) + ServiceNodePortStaticSubrange=true|false (ALPHA - default=false) SizeMemoryBackedVolumes=true|false (BETA - default=true) - StatefulSetAutoDeletePVC=true|false (ALPHA - default=false) - StatefulSetStartOrdinal=true|false (ALPHA - default=false) + StableLoadBalancerNodeSet=true|false (BETA - default=true) + StatefulSetAutoDeletePVC=true|false (BETA - default=true) + StatefulSetStartOrdinal=true|false (BETA - default=true) StorageVersionAPI=true|false (ALPHA - default=false) StorageVersionHash=true|false (BETA - default=true) TopologyAwareHints=true|false (BETA - default=true) - TopologyManager=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) TopologyManagerPolicyOptions=true|false (ALPHA - default=false) UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) ValidatingAdmissionPolicy=true|false (ALPHA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) + WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) WinOverlay=true|false (BETA - default=true) WindowsHostNetwork=true|false (ALPHA - default=true) diff --git a/kubernetes/cli/kubelet.txt b/kubernetes/cli/kubelet.txt index 2e4933419..05485bb31 100644 --- a/kubernetes/cli/kubelet.txt +++ b/kubernetes/cli/kubelet.txt @@ -45,13 +45,12 @@ Flags: --cluster-domain string Domain for this cluster. If set, kubelet will configure all containers to search this domain in addition to the host's search domains (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --config string The Kubelet will load its initial configuration from this file. The path may be absolute or relative; relative paths start at the Kubelet's current working directory. Omit this flag to use the built-in default configuration values. Command-line flags override configuration from this file. --container-hints string location of the container hints file (default "/etc/cadvisor/container_hints.json") (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) - --container-log-max-files int32 Set the maximum number of container log files that can be present for a container. The number must be >= 2. This flag can only be used with --container-runtime=remote. (default 5) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --container-log-max-size string Set the maximum size (e.g. 10Mi) of container log file before it is rotated. This flag can only be used with --container-runtime=remote. (default "10Mi") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --container-runtime string The container runtime to use. Possible value: 'remote'. (default "remote") (DEPRECATED: will be removed in 1.27 as the only valid value is 'remote') - --container-runtime-endpoint string The endpoint of remote runtime service. Unix Domain Sockets are supported on Linux, while npipe and tcp endpoints are supported on Windows. Examples:'unix:///path/to/runtime.sock', 'npipe:////./pipe/runtime' + --container-log-max-files int32 Set the maximum number of container log files that can be present for a container. The number must be >= 2. (default 5) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --container-log-max-size string Set the maximum size (e.g. 10Mi) of container log file before it is rotated. (default "10Mi") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --container-runtime-endpoint string The endpoint of container runtime service. Unix Domain Sockets are supported on Linux, while npipe and tcp endpoints are supported on Windows. Examples:'unix:///path/to/runtime.sock', 'npipe:////./pipe/runtime' (default "unix:///run/containerd/containerd.sock") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --containerd string containerd endpoint (default "/run/containerd/containerd.sock") (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) --containerd-namespace string containerd namespace (default "k8s.io") (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) - --contention-profiling Enable lock contention profiling, if profiling is enabled (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --contention-profiling Enable block profiling, if profiling is enabled (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --cpu-cfs-quota Enable CPU CFS quota enforcement for containers that specify CPU limits (default true) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --cpu-cfs-quota-period duration Sets CPU CFS quota period value, cpu.cfs_period_us, defaults to Linux Kernel default (default 100ms) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --cpu-manager-policy string CPU Manager policy to use. Possible values: 'none', 'static'. (default "none") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) @@ -62,8 +61,8 @@ Flags: --enable-load-reader Whether to enable cpu load reader (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) --enable-server Enable the Kubelet's server (default true) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --enforce-node-allocatable strings A comma separated list of levels of node allocatable enforcement to be enforced by kubelet. Acceptable options are 'none', 'pods', 'system-reserved', and 'kube-reserved'. If the latter two options are specified, '--system-reserved-cgroup' and '--kube-reserved-cgroup' must also be set, respectively. If 'none' is specified, no additional options should be set. See https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources/ for more details. (default [pods]) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --event-burst int32 Maximum size of a bursty event records, temporarily allows event records to burst to this number, while still not exceeding event-qps. The number must be >= 0. If 0 will use DefaultBurst: 10. (default 10) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --event-qps int32 QPS to limit event creations. The number must be >= 0. If 0 will use DefaultQPS: 5. (default 5) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --event-burst int32 Maximum size of a bursty event records, temporarily allows event records to burst to this number, while still not exceeding event-qps. The number must be >= 0. If 0 will use DefaultBurst: 10. (default 100) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --event-qps int32 QPS to limit event creations. The number must be >= 0. If 0 will use DefaultQPS: 5. (default 50) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --event-storage-age-limit string Max length of time for which to store events (per type). Value is a comma separated list of key values, where the keys are event types (e.g.: creation, oom) or "default" and the value is a duration. Default is applied to all non-specified event types (default "default=0") (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) --event-storage-event-limit string Max number of events to store (per type). Value is a comma separated list of key values, where the keys are event types (e.g.: creation, oom) or "default" and the value is an integer. Default is applied to all non-specified event types (default "default=0") (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) --eviction-hard mapStringString A set of eviction thresholds (e.g. memory.available<1Gi) that if met would trigger a pod eviction. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) @@ -80,10 +79,11 @@ Flags: APIListChunking=true|false (BETA - default=true) APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) - APISelfSubjectReview=true|false (ALPHA - default=false) + APISelfSubjectReview=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) - APIServerTracing=true|false (ALPHA - default=false) - AggregatedDiscoveryEndpoint=true|false (ALPHA - default=false) + APIServerTracing=true|false (BETA - default=true) + AdmissionWebhookMatchConditions=true|false (ALPHA - default=false) + AggregatedDiscoveryEndpoint=true|false (BETA - default=true) AllAlpha=true|false (ALPHA - default=false) AllBeta=true|false (BETA - default=false) AnyVolumeDataSource=true|false (BETA - default=true) @@ -93,29 +93,31 @@ Flags: CPUManagerPolicyOptions=true|false (BETA - default=true) CSIMigrationPortworx=true|false (BETA - default=false) CSIMigrationRBD=true|false (ALPHA - default=false) - CSINodeExpandSecret=true|false (ALPHA - default=false) + CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) - ComponentSLIs=true|false (ALPHA - default=false) + CloudControllerManagerWebhook=true|false (ALPHA - default=false) + CloudDualStackNodeIPs=true|false (ALPHA - default=false) + ClusterTrustBundle=true|false (ALPHA - default=false) + ComponentSLIs=true|false (BETA - default=true) ContainerCheckpoint=true|false (ALPHA - default=false) ContextualLogging=true|false (ALPHA - default=false) - CronJobTimeZone=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) CustomResourceValidationExpressions=true|false (BETA - default=true) DisableCloudProviders=true|false (ALPHA - default=false) DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) - DownwardAPIHugePages=true|false (BETA - default=true) DynamicResourceAllocation=true|false (ALPHA - default=false) - EventedPLEG=true|false (ALPHA - default=false) + ElasticIndexedJob=true|false (BETA - default=true) + EventedPLEG=true|false (BETA - default=false) ExpandedDNSConfig=true|false (BETA - default=true) ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) - GRPCContainerProbe=true|false (BETA - default=true) GracefulNodeShutdown=true|false (BETA - default=true) GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) - HPAContainerMetrics=true|false (ALPHA - default=false) + HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) - IPTablesOwnershipCleanup=true|false (ALPHA - default=false) + IPTablesOwnershipCleanup=true|false (BETA - default=true) + InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) InTreePluginAzureFileUnregister=true|false (ALPHA - default=false) @@ -124,63 +126,67 @@ Flags: InTreePluginPortworxUnregister=true|false (ALPHA - default=false) InTreePluginRBDUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) - JobMutableNodeSchedulingDirectives=true|false (BETA - default=true) JobPodFailurePolicy=true|false (BETA - default=true) JobReadyPods=true|false (BETA - default=true) - KMSv2=true|false (ALPHA - default=false) + KMSv2=true|false (BETA - default=true) KubeletInUserNamespace=true|false (ALPHA - default=false) KubeletPodResources=true|false (BETA - default=true) + KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) + KubeletPodResourcesGet=true|false (ALPHA - default=false) KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) - KubeletTracing=true|false (ALPHA - default=false) - LegacyServiceAccountTokenTracking=true|false (ALPHA - default=false) + KubeletTracing=true|false (BETA - default=true) + LegacyServiceAccountTokenTracking=true|false (BETA - default=true) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) LoggingBetaOptions=true|false (BETA - default=true) - MatchLabelKeysInPodTopologySpread=true|false (ALPHA - default=false) + MatchLabelKeysInPodTopologySpread=true|false (BETA - default=true) MaxUnavailableStatefulSet=true|false (ALPHA - default=false) MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) - MinDomainsInPodTopologySpread=true|false (BETA - default=false) - MinimizeIPTablesRestore=true|false (ALPHA - default=false) + MinDomainsInPodTopologySpread=true|false (BETA - default=true) + MinimizeIPTablesRestore=true|false (BETA - default=true) MultiCIDRRangeAllocator=true|false (ALPHA - default=false) + MultiCIDRServiceAllocator=true|false (ALPHA - default=false) NetworkPolicyStatus=true|false (ALPHA - default=false) + NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) + NodeLogQuery=true|false (ALPHA - default=false) NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) NodeSwap=true|false (ALPHA - default=false) OpenAPIEnums=true|false (BETA - default=true) - OpenAPIV3=true|false (BETA - default=true) - PDBUnhealthyPodEvictionPolicy=true|false (ALPHA - default=false) + PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) PodHasNetworkCondition=true|false (ALPHA - default=false) - PodSchedulingReadiness=true|false (ALPHA - default=false) + PodSchedulingReadiness=true|false (BETA - default=true) ProbeTerminationGracePeriod=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) ProxyTerminatingEndpoints=true|false (BETA - default=true) QOSReserved=true|false (ALPHA - default=false) - ReadWriteOncePod=true|false (ALPHA - default=false) + ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) RemainingItemCount=true|false (BETA - default=true) RetroactiveDefaultStorageClass=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) - SELinuxMountReadWriteOncePod=true|false (ALPHA - default=false) - SeccompDefault=true|false (BETA - default=true) - ServerSideFieldValidation=true|false (BETA - default=true) + SELinuxMountReadWriteOncePod=true|false (BETA - default=true) + SecurityContextDeny=true|false (ALPHA - default=false) + ServiceNodePortStaticSubrange=true|false (ALPHA - default=false) SizeMemoryBackedVolumes=true|false (BETA - default=true) - StatefulSetAutoDeletePVC=true|false (ALPHA - default=false) - StatefulSetStartOrdinal=true|false (ALPHA - default=false) + StableLoadBalancerNodeSet=true|false (BETA - default=true) + StatefulSetAutoDeletePVC=true|false (BETA - default=true) + StatefulSetStartOrdinal=true|false (BETA - default=true) StorageVersionAPI=true|false (ALPHA - default=false) StorageVersionHash=true|false (BETA - default=true) TopologyAwareHints=true|false (BETA - default=true) - TopologyManager=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) TopologyManagerPolicyOptions=true|false (ALPHA - default=false) UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) ValidatingAdmissionPolicy=true|false (ALPHA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) + WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) WinOverlay=true|false (BETA - default=true) WindowsHostNetwork=true|false (ALPHA - default=true) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) @@ -197,14 +203,14 @@ Flags: --image-credential-provider-config string The path to the credential provider plugin config file. --image-gc-high-threshold int32 The percent of disk usage after which image garbage collection is always run. Values must be within the range [0, 100], To disable image garbage collection, set to 100. (default 85) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --image-gc-low-threshold int32 The percent of disk usage before which image garbage collection is never run. Lowest disk usage to garbage collect to. Values must be within the range [0, 100] and should not be larger than that of --image-gc-high-threshold. (default 80) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --image-service-endpoint string The endpoint of remote image service. If not specified, it will be the same with --container-runtime-endpoint by default. Unix Domain Socket are supported on Linux, while npipe and tcp endpoints are supported on Windows. Examples:'unix:///path/to/runtime.sock', 'npipe:////./pipe/runtime' + --image-service-endpoint string The endpoint of container image service. If not specified, it will be the same with --container-runtime-endpoint by default. Unix Domain Socket are supported on Linux, while npipe and tcp endpoints are supported on Windows. Examples:'unix:///path/to/runtime.sock', 'npipe:////./pipe/runtime' (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --iptables-drop-bit int32 The bit of the fwmark space to mark packets for dropping. Must be within the range [0, 31]. (default 15) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --iptables-masquerade-bit int32 The bit of the fwmark space to mark packets for SNAT. Must be within the range [0, 31]. Please match this parameter with corresponding parameter in kube-proxy. (default 14) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --keep-terminated-pod-volumes Keep terminated pod volumes mounted to the node after the pod terminates. Can be useful for debugging volume related issues. (DEPRECATED: will be removed in a future version) --kernel-memcg-notification If enabled, the kubelet will integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --kube-api-burst int32 Burst to use while talking with kubernetes apiserver. The number must be >= 0. If 0 will use DefaultBurst: 10. Doesn't cover events and node heartbeat apis which rate limiting is controlled by a different set of flags (default 10) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --kube-api-burst int32 Burst to use while talking with kubernetes apiserver. The number must be >= 0. If 0 will use DefaultBurst: 100. Doesn't cover events and node heartbeat apis which rate limiting is controlled by a different set of flags (default 100) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --kube-api-content-type string Content type of requests sent to apiserver. (default "application/vnd.kubernetes.protobuf") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --kube-api-qps int32 QPS to use while talking with kubernetes apiserver. The number must be >= 0. If 0 will use DefaultQPS: 5. Doesn't cover events and node heartbeat apis which rate limiting is controlled by a different set of flags (default 5) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --kube-api-qps int32 QPS to use while talking with kubernetes apiserver. The number must be >= 0. If 0 will use DefaultQPS: 50. Doesn't cover events and node heartbeat apis which rate limiting is controlled by a different set of flags (default 50) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --kube-reserved mapStringString A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=500Mi,ephemeral-storage=1Gi) pairs that describe resources reserved for kubernetes system components. Currently only cpu, memory and local ephemeral storage for root file system are supported. See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ for more detail. [default=none] (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --kube-reserved-cgroup string Absolute name of the top level cgroup that is used to manage kubernetes components for which compute resources were reserved via '--kube-reserved' flag. Ex. '/kube-reserved'. [default=''] (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --kubeconfig string Path to a kubeconfig file, specifying how to connect to the API server. Providing --kubeconfig enables API server mode, omitting --kubeconfig enables standalone mode. @@ -220,7 +226,6 @@ Flags: --make-iptables-util-chains If true, kubelet will ensure iptables utility rules are present on host. (default true) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --manifest-url string URL for accessing additional Pod specifications to run (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --manifest-url-header colonSeparatedMultimapStringString Comma-separated list of HTTP headers to use when accessing the url provided to --manifest-url. Multiple headers with the same name will be added in the same order provided. This flag can be repeatedly invoked. For example: --manifest-url-header 'a:hello,b:again,c:world' --manifest-url-header 'b:beautiful' (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --master-service-namespace string The namespace from which the kubernetes master services should be injected into pods (default "default") (DEPRECATED: This flag will be removed in a future version.) --max-open-files int Number of files that can be opened by Kubelet process. (default 1000000) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --max-pods int32 Number of Pods that can run on this Kubelet. (default 110) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --maximum-dead-containers int32 Maximum number of old instances of containers to retain globally. Each container takes up some disk space. To disable, set to a negative number. (default -1) (DEPRECATED: Use --eviction-hard or --eviction-soft instead. Will be removed in a future version.) @@ -234,7 +239,7 @@ Flags: --node-status-update-frequency duration Specifies how often kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller. (default 10s) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --oom-score-adj int32 The oom-score-adj value for kubelet process. Values must be within the range [-1000, 1000] (default -999) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --pod-cidr string The CIDR to use for pod IP addresses, only used in standalone mode. In cluster mode, this is obtained from the master. For IPv6, the maximum number of IP's allocated is 65536 (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --pod-infra-container-image string Specified image will not be pruned by the image garbage collector. CRI implementations have their own configuration to set this image. (default "registry.k8s.io/pause:3.9") (DEPRECATED: will be removed in 1.27. Image garbage collector will get sandbox image information from CRI.) + --pod-infra-container-image string Specified image will not be pruned by the image garbage collector. CRI implementations have their own configuration to set this image. (default "registry.k8s.io/pause:3.9") (DEPRECATED: will be removed in a future release. Image garbage collector will get sandbox image information from CRI.) --pod-manifest-path string Path to the directory containing static pod files to run, or the path to a single static pod file. Files starting with dots will be ignored. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --pod-max-pids int Set the maximum number of processes per pod. If -1, the kubelet defaults to the node allocatable pid capacity. (default -1) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --pods-per-core int32 Number of Pods per core that can run on this Kubelet. The total number of Pods on this Kubelet cannot exceed max-pods, so max-pods will be used if this calculation results in a larger number of Pods allowed on the Kubelet. A value of 0 disables this limit. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) @@ -252,12 +257,12 @@ Flags: --reserved-memory reserved-memory A comma separated list of memory reservations for NUMA nodes. (e.g. --reserved-memory 0:memory=1Gi,hugepages-1M=2Gi --reserved-memory 1:memory=2Gi). The total sum for each memory type should be equal to the sum of kube-reserved, system-reserved and eviction-threshold. See https://kubernetes.io/docs/tasks/administer-cluster/memory-manager/#reserved-memory-flag for more details. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --resolv-conf string Resolver configuration file used as the basis for the container DNS resolution configuration. (default "/etc/resolv.conf") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --root-dir string Directory path for managing kubelet files (volume mounts,etc). (default "/var/lib/kubelet") - --rotate-certificates Auto rotate the kubelet client certificates by requesting new certificates from the kube-apiserver when the certificate expiration approaches. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --rotate-certificates Auto rotate the kubelet client certificates by requesting new certificates from the kube-apiserver when the certificate expiration approaches. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --rotate-server-certificates Auto-request and rotate the kubelet serving certificates by requesting new certificates from the kube-apiserver when the certificate expiration approaches. Requires the RotateKubeletServerCertificate feature gate to be enabled, and approval of the submitted CertificateSigningRequest objects. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --runonce If true, exit after spawning pods from static pod files or remote urls. Exclusive with --enable-server (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --runtime-cgroups string Optional absolute name of cgroups to create and run the runtime in. --runtime-request-timeout duration Timeout of all runtime requests except long running request - pull, logs, exec and attach. When timeout exceeded, kubelet will cancel the request, throw out an error and retry later. (default 2m0s) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --seccomp-default RuntimeDefault Enable the use of RuntimeDefault as the default seccomp profile for all workloads. The SeccompDefault feature gate must be enabled to allow this flag, which is disabled per default. + --seccomp-default RuntimeDefault Enable the use of RuntimeDefault as the default seccomp profile for all workloads. --serialize-image-pulls Pull images one at a time. We recommend *not* changing the default value on nodes that run docker daemon with version < 1.9 or an Aufs storage backend. Issue #10959 has more details. (default true) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --storage-driver-buffer-duration duration Writes in the storage driver will be buffered for this duration, and committed to the non memory backends as a single transaction (default 1m0s) (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) --storage-driver-db string database name (default "cadvisor") (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) From 5c3ec92297e9e99f363c009293801a8ef52d5a22 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 10 Jun 2023 18:21:00 +0800 Subject: [PATCH 07/42] [Kubernetes] Test v1.28.0-alpha.2 [sync git] Signed-off-by: Kang Huaishuai --- kubernetes/.github/workflows/setup-k8s.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index c520a4be3..0cf6c964d 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -44,11 +44,11 @@ jobs: # GENERATE_CLI_HELP: "true" # next version - # - os: ubuntu - # dist: 20.04 - # CI_KUBERNETES_VERSION: 1.28.0-alpha.1 - # LNMP_K8S_GET: --url - # GENERATE_CLI_HELP: "true" + - os: ubuntu + dist: 20.04 + CI_KUBERNETES_VERSION: 1.28.0-alpha.2 + LNMP_K8S_GET: --url + GENERATE_CLI_HELP: "true" # current stable version - os: ubuntu @@ -542,9 +542,9 @@ jobs: run: | export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH - BASE_BRANCH=v1.28.0-alpha.1-config + BASE_BRANCH=v1.28.0-alpha.2-config BASE_BRANCH=master - if [ $CI_KUBERNETES_VERSION != '1.28.0-alpha.1' ];then + if [ $CI_KUBERNETES_VERSION != '1.28.0-alpha.2' ];then exit 0 fi From 028f8e1dd8fdddfc0b97d372851ace76049a24a7 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 10 Jun 2023 20:20:21 +0800 Subject: [PATCH 08/42] [Kubernetes] remove kube-proxy err flag [sync git] Signed-off-by: Kang Huaishuai --- kubernetes/coreos/ignition/bu/kube-proxy.bu | 1 - kubernetes/systemd/system/kube-proxy.service | 1 - 2 files changed, 2 deletions(-) diff --git a/kubernetes/coreos/ignition/bu/kube-proxy.bu b/kubernetes/coreos/ignition/bu/kube-proxy.bu index 6a3d3cb2f..e34a6c448 100644 --- a/kubernetes/coreos/ignition/bu/kube-proxy.bu +++ b/kubernetes/coreos/ignition/bu/kube-proxy.bu @@ -25,7 +25,6 @@ systemd: ExecStart=${K8S_ROOT}/bin/kube-proxy \ --config=${K8S_ROOT}/etc/kubernetes/kube-proxy.config.yaml \ - --logging-format=json \ --v=2 # --feature-gates=AllAlpha=true,BoundServiceAccountTokenVolume=false \ diff --git a/kubernetes/systemd/system/kube-proxy.service b/kubernetes/systemd/system/kube-proxy.service index 799d6376e..0ed08e9ea 100644 --- a/kubernetes/systemd/system/kube-proxy.service +++ b/kubernetes/systemd/system/kube-proxy.service @@ -34,7 +34,6 @@ cat ${K8S_ROOT}/etc/kubernetes/kube-proxy.config.yaml.temp \ ExecStart=/opt/k8s/bin/kube-proxy \ --config=${K8S_ROOT}/etc/kubernetes/kube-proxy.config.yaml \ ---logging-format=json \ --v=2 Restart=on-failure From bca10ba90b209dfac570f990df38cf65a597606a Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 17 Jun 2023 10:45:50 +0800 Subject: [PATCH 09/42] Update github release download mirror url Signed-off-by: Kang Huaishuai --- .vscode/settings.json | 7 ++++++- docs/network.md | 2 +- kubernetes/lnmp-k8s | 14 +++++++------- lnmp-docker | 2 +- windows/lnmp-windows-pm-repo/cfssl/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/compose/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/compose/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/coredns/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/deno/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/dive/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/etcher/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/etcher/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/frp/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/gh/lwpm.json | 4 ++-- windows/lnmp-windows-pm-repo/jx/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/jx/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.yml | 2 +- .../lnmp-windows-pm-repo/k8s/containerd/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/containerd/lwpm.yml | 2 +- windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml | 2 +- .../lnmp-windows-pm-repo/k8s/istioctl/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/istioctl/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/k8s/runc/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/k8s/runc/lwpm.yml | 2 +- windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.yml | 2 +- .../lnmp-windows-pm-repo/php-cgi-spawner/lwpm.json | 2 +- .../lnmp-windows-pm-repo/php-cgi-spawner/lwpm.yaml | 2 +- .../lnmp-windows-pm-repo/php-cs-fixer/lwpm.json | 2 +- .../lnmp-windows-pm-repo/php-igbinary/lwpm.json | 2 +- .../lnmp-windows-pm-repo/php-igbinary/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/php-mongodb/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/php-mongodb/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/php-redis/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/php-redis/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/pwsh/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/s6/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/s6/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/vim/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/zeal/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/zstd/lwpm.json | 2 +- wsl2/bin/kernel.ps1 | 2 +- 46 files changed, 58 insertions(+), 53 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 379a9252c..1cb5215bf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -87,5 +87,10 @@ "source": "Git Bash" } }, - "terminal.integrated.defaultProfile.windows": "PowerShell" + "terminal.integrated.defaultProfile.windows": "PowerShell", + "files.readonlyInclude": { + // ".env.example": true, + // ".env.example.ps1": true, + // ".env.global": true, + } } diff --git a/docs/network.md b/docs/network.md index 8891bb987..45bf32f90 100644 --- a/docs/network.md +++ b/docs/network.md @@ -11,7 +11,7 @@ $ git clone https://hub.fastgit.org/author/repo # https://github.com/A/A/releases/download/1.0/1.0.tar.gz -$ wget https://download.fastgit.org/A/A/releases/download/1.0/1.0.tar.gz +$ wget https://download.fgit.ml/A/A/releases/download/1.0/1.0.tar.gz # https://raw.githubusercontent.com/ # https://raw.fastgit.org/ diff --git a/kubernetes/lnmp-k8s b/kubernetes/lnmp-k8s index 21fdc8c4c..59bb30572 100755 --- a/kubernetes/lnmp-k8s +++ b/kubernetes/lnmp-k8s @@ -462,7 +462,7 @@ _gvisor_install(){ print_info "install gvisor(runsc) ..." local url_official="https://github.com/docker-practice/gvisor-mirror/releases/download/nightly" - local url="https://download.fastgit.org/docker-practice/gvisor-mirror/releases/download/nightly" + local url="https://download.fgit.ml/docker-practice/gvisor-mirror/releases/download/nightly" local TAR_FILE="runsc-${GOOS}-${GOARCH}.tar.gz" if [ "$DOWNLOAD_FROM_CODING" != "false" ];then @@ -506,7 +506,7 @@ _runc_install(){ local file_name=runc.${GOARCH} local url_official=https://github.com/opencontainers/runc/releases/download/v${RUNC_VERSION} - local url=https://download.fastgit.org/opencontainers/runc/releases/download/v${RUNC_VERSION} + local url=https://download.fgit.ml/opencontainers/runc/releases/download/v${RUNC_VERSION} if [ "$DOWNLOAD_FROM_CODING" != "false" ];then url=${CODING_URL}/${file_name}?version=${RUNC_VERSION} @@ -556,7 +556,7 @@ _crun_install(){ fi local file_name=crun-${CRUN_VERSION}-linux-${GOARCH} - local url=https://download.fastgit.org/containers/crun/releases/download/${CRUN_VERSION} + local url=https://download.fgit.ml/containers/crun/releases/download/${CRUN_VERSION} local url_official=https://github.com/containers/crun/releases/download/${CRUN_VERSION} if [ "$DOWNLOAD_FROM_CODING" != "false" ];then @@ -569,7 +569,7 @@ _crun_install(){ $(_sudo) $(_curl) ${url} -o /usr/bin/crun file_name=crun-${CRUN_VERSION}-linux-${GOARCH}-disable-systemd - url=https://download.fastgit.org/containers/crun/releases/download/${CRUN_VERSION} + url=https://download.fgit.ml/containers/crun/releases/download/${CRUN_VERSION} url_official=https://github.com/containers/crun/releases/download/${CRUN_VERSION} if [ "$DOWNLOAD_FROM_CODING" != "false" ];then @@ -611,7 +611,7 @@ _containerd_install(){ print_info "install containerd 1.7 ..." local url_official="https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}" - local url="https://download.fastgit.org/containerd/containerd/releases/download/v${CONTAINERD_VERSION}" + local url="https://download.fgit.ml/containerd/containerd/releases/download/v${CONTAINERD_VERSION}" local TAR_FILE="cri-containerd-${CONTAINERD_VERSION}-${GOOS}-${GOARCH}.tar.gz" @@ -733,7 +733,7 @@ _crictl_install(){ fi local url_official="https://github.com/kubernetes-sigs/cri-tools/releases/download/v${CRICTL_VERSION}" - local url="https://download.fastgit.org/kubernetes-sigs/cri-tools/releases/download/v${CRICTL_VERSION}" + local url="https://download.fgit.ml/kubernetes-sigs/cri-tools/releases/download/v${CRICTL_VERSION}" local TAR_FILE="crictl-v${CRICTL_VERSION}-linux-${GOARCH}.tar.gz" if [ "$DOWNLOAD_FROM_CODING" != "false" ];then @@ -841,7 +841,7 @@ _conmon_install(){ fi local url_official=https://github.com/containers/conmon/releases/download/v${CONMON_VERSION}/conmon.$GOARCH - local url=https://download.fastgit.org/containers/conmon/releases/download/v${CONMON_VERSION}/conmon.$GOARCH + local url=https://download.fgit.ml/containers/conmon/releases/download/v${CONMON_VERSION}/conmon.$GOARCH if [ $DOWNLOAD_FROM_CODING != "false" ];then url=$CODING_URL/conmon.$GOARCH?version=${CONMON_VERSION} diff --git a/lnmp-docker b/lnmp-docker index 6712354d1..8cf24653c 100755 --- a/lnmp-docker +++ b/lnmp-docker @@ -1555,7 +1555,7 @@ if [ "$debug" = 'true' -o "$DEBUG" = 'true' ];then set -x; fi COMPOSE_LINK_OFFICIAL=https://github.com/docker/compose/releases/download # COMPOSE_LINK=https://code.aliyun.com/khs1994-docker/compose-cn-mirror/raw -COMPOSE_LINK=https://download.fastgit.org/docker/compose/releases/download +COMPOSE_LINK=https://download.fgit.ml/docker/compose/releases/download # 在加载 .env 文件之前，先检查是否在环境变量中设置了以下变量，若设置，则使用环境变量 if [ -n "${LNMP_SERVICES}" ];then LNMP_SERVICES_SYSTEM_ENV=$LNMP_SERVICES;fi diff --git a/windows/lnmp-windows-pm-repo/cfssl/lwpm.json b/windows/lnmp-windows-pm-repo/cfssl/lwpm.json index cb185835b..ed7693285 100644 --- a/windows/lnmp-windows-pm-repo/cfssl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/cfssl/lwpm.json @@ -6,7 +6,7 @@ ], "releases": "https://github.com/cloudflare/cfssl/releases", "scripts": { - "install": "$url = \"https://download.fastgit.org/cloudflare/cfssl/releases/download/v${VERSION}\"\n$pkgs='cfssl','cfssl-bundle','cfssl-certinfo','cfssl-newkey','cfssl-scan','cfssljson','mkbundle','multirootca'\nforeach($pkg in $pkgs){\n printInfo Downloading $pkg ...\n\n if($_isWindows){\n $dist=\"C:\\bin\\${pkg}.exe\"\n }else{\n $dist=\"/usr/local/bin/${pkg}\"\n }\n\n if(Test-Path $dist){\n printTips $pkg exists`, skip\n continue;\n }\n\n if($_isWindows){\n curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist\n }else{\n sudo curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist\n sudo chmod +x $dist\n }\n\n}\n", + "install": "$url = \"https://download.fgit.ml/cloudflare/cfssl/releases/download/v${VERSION}\"\n$pkgs='cfssl','cfssl-bundle','cfssl-certinfo','cfssl-newkey','cfssl-scan','cfssljson','mkbundle','multirootca'\nforeach($pkg in $pkgs){\n printInfo Downloading $pkg ...\n\n if($_isWindows){\n $dist=\"C:\\bin\\${pkg}.exe\"\n }else{\n $dist=\"/usr/local/bin/${pkg}\"\n }\n\n if(Test-Path $dist){\n printTips $pkg exists`, skip\n continue;\n }\n\n if($_isWindows){\n curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist\n }else{\n sudo curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist\n sudo chmod +x $dist\n }\n\n}\n", "test": "cfssl version" }, "version": "1.6.1" diff --git a/windows/lnmp-windows-pm-repo/compose/lwpm.json b/windows/lnmp-windows-pm-repo/compose/lwpm.json index 3d28c7cb0..496793e0b 100644 --- a/windows/lnmp-windows-pm-repo/compose/lwpm.json +++ b/windows/lnmp-windows-pm-repo/compose/lwpm.json @@ -38,6 +38,6 @@ "version": "(docker compose version).split(' ')[3].trim('v')" }, "url": "https://github.com/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe})", - "url-mirror": "https://download.fastgit.org/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe})", + "url-mirror": "https://download.fgit.ml/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe})", "version": "2.17.3" } diff --git a/windows/lnmp-windows-pm-repo/compose/lwpm.yaml b/windows/lnmp-windows-pm-repo/compose/lwpm.yaml index 2a16255e5..ec2806f8f 100644 --- a/windows/lnmp-windows-pm-repo/compose/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/compose/lwpm.yaml @@ -2,7 +2,7 @@ name: compose version: 2.17.3 pre-version: 2.17.3 url: https://github.com/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe}) -url-mirror: https://download.fastgit.org/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe}) +url-mirror: https://download.fgit.ml/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe}) scripts: install: - _mkdir $HOME/.docker/cli-plugins/ diff --git a/windows/lnmp-windows-pm-repo/coredns/lwpm.json b/windows/lnmp-windows-pm-repo/coredns/lwpm.json index 2377a24f8..f7ae9bbaf 100644 --- a/windows/lnmp-windows-pm-repo/coredns/lwpm.json +++ b/windows/lnmp-windows-pm-repo/coredns/lwpm.json @@ -8,7 +8,7 @@ "github": "coredns/coredns", "releases": "https://github.com/coredns/coredns/releases", "url": "https://github.com/coredns/coredns/releases/download/v${VERSION}/coredns_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.tgz", - "url-mirror": "https://download.fastgit.org/coredns/coredns/releases/download/v${VERSION}/coredns_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.tgz", + "url-mirror": "https://download.fgit.ml/coredns/coredns/releases/download/v${VERSION}/coredns_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.tgz", "command": "coredns", "scripts": { "test": "printInfo $(coredns --version)[0] install success", diff --git a/windows/lnmp-windows-pm-repo/deno/lwpm.json b/windows/lnmp-windows-pm-repo/deno/lwpm.json index 182637d4e..122d1fa3c 100644 --- a/windows/lnmp-windows-pm-repo/deno/lwpm.json +++ b/windows/lnmp-windows-pm-repo/deno/lwpm.json @@ -8,7 +8,7 @@ "github": "denoland/deno", "releases": "https://github.com/denoland/deno/releases", "url": "https://github.com/denoland/deno/releases/download/v${VERSION}/deno-x86_64-$(if($IsWindows){echo pc-windows-msvc}elseif($IsMacOS){echo apple-darwin}else{echo unknown-linux-gnu}).zip", - "url-mirror": "https://download.fastgit.org/denoland/deno/releases/download/v${VERSION}/deno-x86_64-$(if($IsWindows){echo pc-windows-msvc}elseif($IsMacOS){echo apple-darwin}else{echo unknown-linux-gnu}).zip", + "url-mirror": "https://download.fgit.ml/denoland/deno/releases/download/v${VERSION}/deno-x86_64-$(if($IsWindows){echo pc-windows-msvc}elseif($IsMacOS){echo apple-darwin}else{echo unknown-linux-gnu}).zip", "command": "deno", "download-filename": "deno-${VERSION}-x86_64-pc-windows-msvc.zip", "scripts": { diff --git a/windows/lnmp-windows-pm-repo/dive/lwpm.json b/windows/lnmp-windows-pm-repo/dive/lwpm.json index 5e946cb9d..82d9f6d28 100644 --- a/windows/lnmp-windows-pm-repo/dive/lwpm.json +++ b/windows/lnmp-windows-pm-repo/dive/lwpm.json @@ -8,7 +8,7 @@ "github": "wagoodman/dive", "releases": "https://github.com/wagoodman/dive/releases", "url": "https://github.com/wagoodman/dive/releases/download/v${VERSION}/dive_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", - "url-mirror": "https://download.fastgit.org/wagoodman/dive/releases/download/v${VERSION}/dive_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", + "url-mirror": "https://download.fgit.ml/wagoodman/dive/releases/download/v${VERSION}/dive_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", "hash-url": { "sha256": "https://github.com/wagoodman/dive/releases/download/v${VERSION}/dive_${VERSION}_checksums.txt" }, diff --git a/windows/lnmp-windows-pm-repo/etcher/lwpm.json b/windows/lnmp-windows-pm-repo/etcher/lwpm.json index de29598c3..14b44be8c 100644 --- a/windows/lnmp-windows-pm-repo/etcher/lwpm.json +++ b/windows/lnmp-windows-pm-repo/etcher/lwpm.json @@ -6,7 +6,7 @@ "platform-reqs": "if($env:lwpm_os -eq 'linux'){echo $false}" }, "url": "https://github.com/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}})", - "url-mirror": "https://download.fastgit.org/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}})", + "url-mirror": "https://download.fgit.ml/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}})", "version": "1.18.4", "github": "balena-io/etcher" } diff --git a/windows/lnmp-windows-pm-repo/etcher/lwpm.yaml b/windows/lnmp-windows-pm-repo/etcher/lwpm.yaml index 4bc7a38e0..7825d961f 100644 --- a/windows/lnmp-windows-pm-repo/etcher/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/etcher/lwpm.yaml @@ -4,6 +4,6 @@ scripts: platform-reqs: if($env:lwpm_os -eq 'linux'){echo $false} install: Start-Process -FilePath $filename -wait url: https://github.com/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}}) -url-mirror: https://download.fastgit.org/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}}) +url-mirror: https://download.fgit.ml/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}}) version: 1.18.4 github: balena-io/etcher diff --git a/windows/lnmp-windows-pm-repo/frp/lwpm.json b/windows/lnmp-windows-pm-repo/frp/lwpm.json index 67a81c408..fcbbb3935 100644 --- a/windows/lnmp-windows-pm-repo/frp/lwpm.json +++ b/windows/lnmp-windows-pm-repo/frp/lwpm.json @@ -8,7 +8,7 @@ "github": "fatedier/frp", "releases": "https://github.com/fatedier/frp/releases", "url": "https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", - "url-mirror": "https://download.fastgit.org/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", + "url-mirror": "https://download.fgit.ml/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", "command": "frpc", "scripts": { "service": [ diff --git a/windows/lnmp-windows-pm-repo/gh/lwpm.json b/windows/lnmp-windows-pm-repo/gh/lwpm.json index e86c0fefa..8d74c56bd 100644 --- a/windows/lnmp-windows-pm-repo/gh/lwpm.json +++ b/windows/lnmp-windows-pm-repo/gh/lwpm.json @@ -8,9 +8,9 @@ "github": "cli/cli", "releases": "https://github.com/cli/cli/releases", "url": "https://github.com/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", - "url-mirror": "https://download.fastgit.org/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", + "url-mirror": "https://download.fgit.ml/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", "pre-url": "https://github.com/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", - "pre-url-mirror": "https://download.fastgit.org/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", + "pre-url-mirror": "https://download.fgit.ml/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", "command": "gh", "scripts": { "preinstall": "", diff --git a/windows/lnmp-windows-pm-repo/jx/lwpm.json b/windows/lnmp-windows-pm-repo/jx/lwpm.json index 649c918d4..1cdf7bac6 100644 --- a/windows/lnmp-windows-pm-repo/jx/lwpm.json +++ b/windows/lnmp-windows-pm-repo/jx/lwpm.json @@ -1,7 +1,7 @@ { "command": "jx", "url": "https://github.com/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip", - "url-mirror": "https://download.fastgit.org/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip", + "url-mirror": "https://download.fgit.ml/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip", "github": "jenkins-x/jx", "version": "2.1.33", "description": "Jenkins X provides automated CI+CD for Kubernetes with Preview Environments on Pull Requests using Tekton, Knative, Prow, Skaffold and Helm", diff --git a/windows/lnmp-windows-pm-repo/jx/lwpm.yaml b/windows/lnmp-windows-pm-repo/jx/lwpm.yaml index fe95142a0..dc9bba6e5 100644 --- a/windows/lnmp-windows-pm-repo/jx/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/jx/lwpm.yaml @@ -2,7 +2,7 @@ name: jx description: Jenkins X provides automated CI+CD for Kubernetes with Preview Environments on Pull Requests using Tekton, Knative, Prow, Skaffold and Helm version: 2.1.33 url: https://github.com/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip -url-mirror: https://download.fastgit.org/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip +url-mirror: https://download.fgit.ml/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip github: jenkins-x/jx command: jx scripts: diff --git a/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.json index c89b9eeae..2a86634db 100644 --- a/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.json @@ -15,6 +15,6 @@ "platform-reqs": "if(!$IsLinux){echo $False}" }, "url": "https://github.com/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture}", - "url-mirror": "https://download.fastgit.org/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture}", + "url-mirror": "https://download.fgit.ml/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture}", "version": "2.1.3" } diff --git a/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.yml index 6a0df52d9..808908b86 100644 --- a/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.yml @@ -1,7 +1,7 @@ name: conmon version: 2.1.3 url: "https://github.com/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture}" -url-mirror: https://download.fastgit.org/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture} +url-mirror: https://download.fgit.ml/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture} scripts: dist: | _mkdir $env:LWPM_PKG_ROOT/dist diff --git a/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.json index 2f1488489..1fd310967 100644 --- a/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.json @@ -23,6 +23,6 @@ "platform-reqs": "if($IsMacOs){echo $False}" }, "url": "https://github.com/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "url-mirror": "https://download.fastgit.org/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", + "url-mirror": "https://download.fgit.ml/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", "version": "1.7.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.yml index ff2fb3b27..dd2f316d4 100644 --- a/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.yml @@ -2,7 +2,7 @@ name: containerd version: 1.7.0 pre-version: 1.7.0 url: "https://github.com/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" -url-mirror: https://download.fastgit.org/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz +url-mirror: https://download.fgit.ml/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz scripts: platform-reqs: if($IsMacOs){echo $False} dist: | diff --git a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json index 581647d13..17af39600 100644 --- a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json @@ -31,6 +31,6 @@ "version": "(crictl --version).split(' ')[2].trim('v')" }, "url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "url-mirror": "https://download.fastgit.org/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", + "url-mirror": "https://download.fgit.ml/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", "version": "1.27.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml index b38a22aa3..42fc89d13 100644 --- a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml @@ -1,7 +1,7 @@ name: crictl version: 1.27.0 url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" -url-mirror: https://download.fastgit.org/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz +url-mirror: https://download.fgit.ml/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz command: crictl scripts: dist: | diff --git a/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.json index 9c6181433..cd5143da0 100644 --- a/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.json @@ -13,7 +13,7 @@ "version": "istioctl version --remote=false -s" }, "url": "https://github.com/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip", - "url-mirror": "https://download.fastgit.org/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip", + "url-mirror": "https://download.fgit.ml/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip", "version": "1.10.0", "pre-version": "1.10.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.yaml b/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.yaml index 72fdead00..9c7be74fd 100644 --- a/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.yaml @@ -1,6 +1,6 @@ name: istioctl url: https://github.com/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip -url-mirror: https://download.fastgit.org/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip +url-mirror: https://download.fgit.ml/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip version: 1.10.0 pre-version: 1.10.0 scripts: diff --git a/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.json index 6e5727b88..a9e8bfb1f 100644 --- a/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.json @@ -15,6 +15,6 @@ "platform-reqs": "if(!$IsLinux){echo $False}" }, "url": "https://github.com/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture}", - "url-mirror": "https://download.fastgit.org/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture}", + "url-mirror": "https://download.fgit.ml/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture}", "version": "1.1.3" } diff --git a/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.yml index 4f2b60515..03913a174 100644 --- a/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.yml @@ -1,7 +1,7 @@ name: runc version: 1.1.3 url: "https://github.com/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture}" -url-mirror: https://download.fastgit.org/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture} +url-mirror: https://download.fgit.ml/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture} scripts: platform-reqs: if(!$IsLinux){echo $False} dist: | diff --git a/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.json index d14687fb8..4a7f6f471 100644 --- a/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.json @@ -13,6 +13,6 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist\n\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/$filename\n" }, "url": "https://github.com/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz", - "url-mirror": "https://download.fastgit.org/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz", + "url-mirror": "https://download.fgit.ml/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz", "version": "nightly" } diff --git a/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.yml index 95fe1c364..265ff0ca9 100644 --- a/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.yml @@ -1,7 +1,7 @@ name: runsc version: nightly url: "https://github.com/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz" -url-mirror: https://download.fastgit.org/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz +url-mirror: https://download.fgit.ml/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz scripts: platform-reqs: if(!$IsLinux){echo $False} dist: | diff --git a/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.json b/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.json index 5cbb1b61e..b9bb6173c 100644 --- a/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.json @@ -35,6 +35,6 @@ "version": "" }, "url": "https://github.com/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe", - "url-mirror": "https://download.fastgit.org/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe", + "url-mirror": "https://download.fgit.ml/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe", "version": "1.1.23" } diff --git a/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.yaml index d7db64585..f744642ba 100644 --- a/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.yaml @@ -7,7 +7,7 @@ bug: "" github: deemru/php-cgi-spawner releases: "" url: "https://github.com/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe" -url-mirror: "https://download.fastgit.org/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe" +url-mirror: "https://download.fgit.ml/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe" pre-url: "" pre-url-mirror: "" command: "" diff --git a/windows/lnmp-windows-pm-repo/php-cs-fixer/lwpm.json b/windows/lnmp-windows-pm-repo/php-cs-fixer/lwpm.json index a631ebb1c..58d9b4872 100644 --- a/windows/lnmp-windows-pm-repo/php-cs-fixer/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-cs-fixer/lwpm.json @@ -8,7 +8,7 @@ "github": "FriendsOfPHP/PHP-CS-Fixer", "releases": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${VERSION}/php-cs-fixer.phar", - "url-mirror": "https://download.fastgit.org/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${VERSION}/php-cs-fixer.phar", + "url-mirror": "https://download.fgit.ml/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${VERSION}/php-cs-fixer.phar", "command": "php-cs-fixer", "download-filename": "php-cs-fixer-${VERSION}.phar", "scripts": { diff --git a/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.json b/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.json index 3d7a4cb39..16c9a8646 100644 --- a/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.json @@ -14,7 +14,7 @@ "releases": "", "scripts": { "install": [ - "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fastgit.org'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT} --php ${env:PHP_BIN}\n" + "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fgit.ml'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT} --php ${env:PHP_BIN}\n" ], "postinstall": "", "posttest": "", diff --git a/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.yaml index 0310f78ab..d63377bf7 100644 --- a/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.yaml @@ -34,7 +34,7 @@ scripts: } $GITHUB_DOWNLOAD_URL='github.com' - $GITHUB_DOWNLOAD_URL='download.fastgit.org' + $GITHUB_DOWNLOAD_URL='download.fgit.ml' $PHP_EXT=${lwpm}.name.replace('php-','') if (Test-Path $HOME/github/pickle/bin/pickle){ diff --git a/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.json b/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.json index 939a00c8b..5973eb174 100644 --- a/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.json @@ -14,7 +14,7 @@ "releases": "", "scripts": { "install": [ - "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fastgit.org'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT}@${VERSION} --php ${env:PHP_BIN}\n" + "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fgit.ml'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT}@${VERSION} --php ${env:PHP_BIN}\n" ], "postinstall": "", "posttest": "", diff --git a/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.yaml index f8502de68..5efd2df5e 100644 --- a/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.yaml @@ -34,7 +34,7 @@ scripts: } $GITHUB_DOWNLOAD_URL='github.com' - $GITHUB_DOWNLOAD_URL='download.fastgit.org' + $GITHUB_DOWNLOAD_URL='download.fgit.ml' $PHP_EXT=${lwpm}.name.replace('php-','') if (Test-Path $HOME/github/pickle/bin/pickle){ diff --git a/windows/lnmp-windows-pm-repo/php-redis/lwpm.json b/windows/lnmp-windows-pm-repo/php-redis/lwpm.json index 23985aeb8..ee7f0ae56 100644 --- a/windows/lnmp-windows-pm-repo/php-redis/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-redis/lwpm.json @@ -14,7 +14,7 @@ "releases": "", "scripts": { "install": [ - "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fastgit.org'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT} --php ${env:PHP_BIN}\n" + "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fgit.ml'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT} --php ${env:PHP_BIN}\n" ], "postinstall": "", "posttest": "", diff --git a/windows/lnmp-windows-pm-repo/php-redis/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-redis/lwpm.yaml index b6b1aa81b..41e9332ea 100644 --- a/windows/lnmp-windows-pm-repo/php-redis/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-redis/lwpm.yaml @@ -34,7 +34,7 @@ scripts: } $GITHUB_DOWNLOAD_URL='github.com' - $GITHUB_DOWNLOAD_URL='download.fastgit.org' + $GITHUB_DOWNLOAD_URL='download.fgit.ml' $PHP_EXT=${lwpm}.name.replace('php-','') if (Test-Path $HOME/github/pickle/bin/pickle){ diff --git a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json index 7a52b4471..131b0a433 100644 --- a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json @@ -14,7 +14,7 @@ "releases": "", "scripts": { "install": [ - "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fastgit.org'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT}@${VERSION} --php ${env:PHP_BIN}\n" + "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fgit.ml'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT}@${VERSION} --php ${env:PHP_BIN}\n" ], "postinstall": "", "posttest": "", diff --git a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml index 9250da260..7bcbf4b6e 100644 --- a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml @@ -34,7 +34,7 @@ scripts: } $GITHUB_DOWNLOAD_URL='github.com' - $GITHUB_DOWNLOAD_URL='download.fastgit.org' + $GITHUB_DOWNLOAD_URL='download.fgit.ml' $PHP_EXT=${lwpm}.name.replace('php-','') if (Test-Path $HOME/github/pickle/bin/pickle){ diff --git a/windows/lnmp-windows-pm-repo/pwsh/lwpm.json b/windows/lnmp-windows-pm-repo/pwsh/lwpm.json index 2ff0e1701..09d70ae8b 100644 --- a/windows/lnmp-windows-pm-repo/pwsh/lwpm.json +++ b/windows/lnmp-windows-pm-repo/pwsh/lwpm.json @@ -8,7 +8,7 @@ "github": "PowerShell/PowerShell", "releases": "https://github.com/PowerShell/PowerShell/releases", "url": "https://github.com/PowerShell/PowerShell/releases/download/v${VERSION}/PowerShell-${VERSION}-$(if($IsWindows){echo win}else{echo osx})-x64.$(if($IsWindows){echo msi}else{echo pkg})", - "url-mirror": "https://download.fastgit.org/PowerShell/PowerShell/releases/download/v${VERSION}/PowerShell-${VERSION}-$(if($IsWindows){echo win}else{echo osx})-x64.$(if($IsWindows){echo msi}else{echo pkg})", + "url-mirror": "https://download.fgit.ml/PowerShell/PowerShell/releases/download/v${VERSION}/PowerShell-${VERSION}-$(if($IsWindows){echo win}else{echo osx})-x64.$(if($IsWindows){echo msi}else{echo pkg})", "command": "pwsh", "scripts": { "platform-reqs": [ diff --git a/windows/lnmp-windows-pm-repo/s6/lwpm.json b/windows/lnmp-windows-pm-repo/s6/lwpm.json index e70274c4b..4fe39c1f2 100644 --- a/windows/lnmp-windows-pm-repo/s6/lwpm.json +++ b/windows/lnmp-windows-pm-repo/s6/lwpm.json @@ -11,6 +11,6 @@ "platform-reqs": "if(!$_IsLinux){echo $false}" }, "url": "https://github.com/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz", - "url-mirror": "https://download.fastgit.org/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz", + "url-mirror": "https://download.fgit.ml/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz", "version": "3.1.4.2" } diff --git a/windows/lnmp-windows-pm-repo/s6/lwpm.yaml b/windows/lnmp-windows-pm-repo/s6/lwpm.yaml index f61be192f..0bea69b2f 100644 --- a/windows/lnmp-windows-pm-repo/s6/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/s6/lwpm.yaml @@ -1,7 +1,7 @@ name: s6 version: 3.1.4.2 url: https://github.com/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz -url-mirror: https://download.fastgit.org/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz +url-mirror: https://download.fgit.ml/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz scripts: platform-reqs: if(!$_IsLinux){echo $false} install: |- diff --git a/windows/lnmp-windows-pm-repo/vim/lwpm.json b/windows/lnmp-windows-pm-repo/vim/lwpm.json index 5be49057b..cd3f3d094 100644 --- a/windows/lnmp-windows-pm-repo/vim/lwpm.json +++ b/windows/lnmp-windows-pm-repo/vim/lwpm.json @@ -8,7 +8,7 @@ "github": "vim/vim-win32-installer", "releases": "https://github.com/vim/vim-win32-installer/releases", "url": "https://github.com/vim/vim-win32-installer/releases/download/v${VERSION}/gvim_${VERSION}_x86.exe", - "url-mirror": "https://download.fastgit.org/vim/vim-win32-installer/releases/download/v${VERSION}/gvim_${VERSION}_x86.exe", + "url-mirror": "https://download.fgit.ml/vim/vim-win32-installer/releases/download/v${VERSION}/gvim_${VERSION}_x86.exe", "command": "vim", "scripts": { "platform-reqs": [ diff --git a/windows/lnmp-windows-pm-repo/zeal/lwpm.json b/windows/lnmp-windows-pm-repo/zeal/lwpm.json index bb0632157..c3a081b02 100644 --- a/windows/lnmp-windows-pm-repo/zeal/lwpm.json +++ b/windows/lnmp-windows-pm-repo/zeal/lwpm.json @@ -8,7 +8,7 @@ "github": "zealdocs/zeal", "releases": "https://github.com/zealdocs/zeal/releases", "url": "https://github.com/zealdocs/zeal/releases/download/v${VERSION}/zeal-${VERSION}-windows-x64.msi", - "url-mirror": "https://download.fastgit.org/zealdocs/zeal/releases/download/v${VERSION}/zeal-${VERSION}-windows-x64.msi", + "url-mirror": "https://download.fgit.ml/zealdocs/zeal/releases/download/v${VERSION}/zeal-${VERSION}-windows-x64.msi", "command": "${env:ProgramFiles}\\Zeal\\zeal.exe", "scripts": { "install": "Start-Process -FilePath 'C:\\windows\\system32\\msiexec.exe' -ArgumentList \"/i $filename /passive\" -Wait", diff --git a/windows/lnmp-windows-pm-repo/zstd/lwpm.json b/windows/lnmp-windows-pm-repo/zstd/lwpm.json index 5d4a53cf4..cca578d72 100644 --- a/windows/lnmp-windows-pm-repo/zstd/lwpm.json +++ b/windows/lnmp-windows-pm-repo/zstd/lwpm.json @@ -8,7 +8,7 @@ "github": "facebook/zstd", "releases": "", "url": "https://github.com/facebook/zstd/releases/download/v${VERSION}/zstd-v${VERSION}-win64.zip", - "url-mirror": "https://download.fastgit.org/facebook/zstd/releases/download/v${VERSION}/zstd-v${VERSION}-win64.zip", + "url-mirror": "https://download.fgit.ml/facebook/zstd/releases/download/v${VERSION}/zstd-v${VERSION}-win64.zip", "pre-url": "", "pre-url-mirror": "", "command": "zstd", diff --git a/wsl2/bin/kernel.ps1 b/wsl2/bin/kernel.ps1 index da4f611b7..b59d413a1 100644 --- a/wsl2/bin/kernel.ps1 +++ b/wsl2/bin/kernel.ps1 @@ -59,7 +59,7 @@ Function _downloader($name, $url) { $GITHUB_RELEASE = "github.com" if ($env:LNMP_CN_ENV -ne "false") { - $GITHUB_RELEASE = "download.fastgit.org" + $GITHUB_RELEASE = "download.fgit.ml" } _downloader "kernel-${kernelversion}-microsoft-standard-WSL2.img" "https://${GITHUB_RELEASE}/khs1994/WSL2-Linux-Kernel/releases/download/${kernelversion}-microsoft-standard-WSL2/kernel-${kernelversion}-microsoft-standard-WSL2.img" From 2eb60246229cd7161237580ab7e7fae98b465f32 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 23 Jul 2023 09:50:05 +0800 Subject: [PATCH 10/42] [k8s] Update wsl case Signed-off-by: Kang Huaishuai --- kubernetes/addons/README.md | 4 +- kubernetes/addons/coredns/README.md | 3 + .../addons/dashboard/base/dashboard.yaml | 2 +- .../addons/dashboard/head/dashboard.head.yaml | 297 ------------------ .../addons/dashboard/head/kustomization.yaml | 2 - .../metrics-server/base/deployment.yaml | 2 +- .../metrics-server/cn/kustomization.yaml | 4 +- kubernetes/docker-compose.bump.yml | 4 +- kubernetes/lnmp-k8s | 3 + .../1.5/certs.d/registry.k8s.io/hosts.toml | 3 - .../1.6/certs.d/registry.k8s.io/hosts.toml | 3 - .../1.7/certs.d/registry.k8s.io/hosts.toml | 3 - .../etc/cri-containerd/1.7/config.toml | 2 +- kubernetes/systemd/system/kubelet@.service | 4 +- .../systemd-journald.service.d/99-mount.conf | 4 + kubernetes/wsl2/00-README.NODE.md | 16 +- kubernetes/wsl2/00-README.SERVER.md | 3 - kubernetes/wsl2/01-README.addons.md | 2 + kubernetes/wsl2/02-README.systemd.md | 9 - kubernetes/wsl2/04-README.kubectl.md | 25 ++ kubernetes/wsl2/README.md | 4 +- 21 files changed, 52 insertions(+), 347 deletions(-) delete mode 100644 kubernetes/addons/dashboard/head/dashboard.head.yaml delete mode 100644 kubernetes/addons/dashboard/head/kustomization.yaml create mode 100644 kubernetes/systemd/system/systemd-journald.service.d/99-mount.conf create mode 100644 kubernetes/wsl2/04-README.kubectl.md diff --git a/kubernetes/addons/README.md b/kubernetes/addons/README.md index a203a9ecf..716b12ee6 100644 --- a/kubernetes/addons/README.md +++ b/kubernetes/addons/README.md @@ -2,11 +2,11 @@ * EFK -* metrics-server `0.6.0` +* metrics-server `0.6.3` * CoreDNS `1.10.1` -* Dashboard `2.6.0` +* Dashboard `2.7.0` * Istio `1.10.0` diff --git a/kubernetes/addons/coredns/README.md b/kubernetes/addons/coredns/README.md index caec4852f..f71b984bb 100644 --- a/kubernetes/addons/coredns/README.md +++ b/kubernetes/addons/coredns/README.md @@ -4,6 +4,9 @@ ```bash $ kubectl apply -k addons/coredns + +# cn +$ kubectl apply -k addons/coredns/cn ``` ## Test diff --git a/kubernetes/addons/dashboard/base/dashboard.yaml b/kubernetes/addons/dashboard/base/dashboard.yaml index eb4a3699d..0e626a7bd 100644 --- a/kubernetes/addons/dashboard/base/dashboard.yaml +++ b/kubernetes/addons/dashboard/base/dashboard.yaml @@ -190,7 +190,7 @@ spec: type: RuntimeDefault containers: - name: kubernetes-dashboard - image: kubernetesui/dashboard:v2.6.0 + image: kubernetesui/dashboard:v2.7.0 imagePullPolicy: Always ports: - containerPort: 8443 diff --git a/kubernetes/addons/dashboard/head/dashboard.head.yaml b/kubernetes/addons/dashboard/head/dashboard.head.yaml deleted file mode 100644 index 4d11e014c..000000000 --- a/kubernetes/addons/dashboard/head/dashboard.head.yaml +++ /dev/null @@ -1,297 +0,0 @@ -# Copyright 2017 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Namespace -metadata: - name: kubernetes-dashboard-head - ---- - -apiVersion: v1 -kind: ServiceAccount -metadata: - labels: - k8s-app: kubernetes-dashboard-head - name: kubernetes-dashboard-head - namespace: kubernetes-dashboard-head - ---- - -kind: Service -apiVersion: v1 -metadata: - labels: - k8s-app: kubernetes-dashboard-head - name: kubernetes-dashboard-head - namespace: kubernetes-dashboard-head -spec: - type: NodePort - ports: - - port: 443 - targetPort: 8443 - selector: - k8s-app: kubernetes-dashboard-head - ---- - -apiVersion: v1 -kind: Secret -metadata: - labels: - k8s-app: kubernetes-dashboard-head - name: kubernetes-dashboard-certs - namespace: kubernetes-dashboard-head -type: Opaque - ---- - -apiVersion: v1 -kind: Secret -metadata: - labels: - k8s-app: kubernetes-dashboard-head - name: kubernetes-dashboard-csrf - namespace: kubernetes-dashboard-head -type: Opaque -data: - csrf: "" - ---- - -apiVersion: v1 -kind: Secret -metadata: - labels: - k8s-app: kubernetes-dashboard-head - name: kubernetes-dashboard-key-holder - namespace: kubernetes-dashboard-head -type: Opaque - ---- - -kind: ConfigMap -apiVersion: v1 -metadata: - labels: - k8s-app: kubernetes-dashboard-head - name: kubernetes-dashboard-settings - namespace: kubernetes-dashboard-head - ---- - -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - labels: - k8s-app: kubernetes-dashboard-head - name: kubernetes-dashboard-head - namespace: kubernetes-dashboard-head -rules: - # Allow Dashboard to get, update and delete Dashboard exclusive secrets. - - apiGroups: [""] - resources: ["secrets"] - resourceNames: ["kubernetes-dashboard-key-holder", "kubernetes-dashboard-certs", "kubernetes-dashboard-csrf"] - verbs: ["get", "update", "delete"] - # Allow Dashboard to get and update 'kubernetes-dashboard-settings' config map. - - apiGroups: [""] - resources: ["configmaps"] - resourceNames: ["kubernetes-dashboard-settings"] - verbs: ["get", "update"] - # Allow Dashboard to get metrics. - - apiGroups: [""] - resources: ["services"] - resourceNames: ["heapster", "dashboard-metrics-scraper-head"] - verbs: ["proxy"] - - apiGroups: [""] - resources: ["services/proxy"] - resourceNames: ["heapster", "http:heapster:", "https:heapster:", "dashboard-metrics-scraper-head", "http:dashboard-metrics-scraper-head"] - verbs: ["get"] - ---- - -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - labels: - k8s-app: kubernetes-dashboard-head - name: kubernetes-dashboard-head -rules: - # Allow Metrics Scraper to get metrics from the Metrics server - - apiGroups: ["metrics.k8s.io"] - resources: ["pods", "nodes"] - verbs: ["get", "list", "watch"] - ---- - -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - labels: - k8s-app: kubernetes-dashboard-head - name: kubernetes-dashboard-head - namespace: kubernetes-dashboard-head -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: kubernetes-dashboard-head -subjects: - - kind: ServiceAccount - name: kubernetes-dashboard-head - namespace: kubernetes-dashboard-head - ---- - -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: kubernetes-dashboard-head -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kubernetes-dashboard-head -subjects: - - kind: ServiceAccount - name: kubernetes-dashboard-head - namespace: kubernetes-dashboard-head - ---- - -kind: Deployment -apiVersion: apps/v1 -metadata: - labels: - k8s-app: kubernetes-dashboard-head - name: kubernetes-dashboard-head - namespace: kubernetes-dashboard-head -spec: - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - k8s-app: kubernetes-dashboard-head - template: - metadata: - labels: - k8s-app: kubernetes-dashboard-head - spec: - containers: - - name: kubernetes-dashboard-head - image: kubernetesdashboarddev/dashboard:head - ports: - - containerPort: 8443 - protocol: TCP - args: - - --auto-generate-certificates - - --namespace=kubernetes-dashboard-head - # Uncomment the following line to manually specify Kubernetes API server Host - # If not specified, Dashboard will attempt to auto discover the API server and connect - # to it. Uncomment only if the default does not work. - # - --apiserver-host=http://my-address:port - volumeMounts: - # Create on-disk volume to store exec logs - - mountPath: /tmp - name: tmp-volume - livenessProbe: - httpGet: - scheme: HTTPS - path: / - port: 8443 - initialDelaySeconds: 30 - timeoutSeconds: 30 - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - runAsUser: 1001 - runAsGroup: 2001 - volumes: - - name: tmp-volume - emptyDir: {} - serviceAccountName: kubernetes-dashboard-head - nodeSelector: - "kubernetes.io/os": linux - # Comment the following tolerations if Dashboard must not be deployed on master - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - ---- - -kind: Service -apiVersion: v1 -metadata: - labels: - k8s-app: dashboard-metrics-scraper-head - name: dashboard-metrics-scraper-head - namespace: kubernetes-dashboard-head -spec: - ports: - - port: 8000 - targetPort: 8000 - selector: - k8s-app: dashboard-metrics-scraper-head - ---- - -kind: Deployment -apiVersion: apps/v1 -metadata: - labels: - k8s-app: dashboard-metrics-scraper-head - name: dashboard-metrics-scraper-head - namespace: kubernetes-dashboard-head -spec: - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - k8s-app: dashboard-metrics-scraper-head - template: - metadata: - labels: - k8s-app: dashboard-metrics-scraper-head - annotations: - seccomp.security.alpha.kubernetes.io/pod: 'runtime/default' - spec: - containers: - - name: dashboard-metrics-scraper-head - image: kubernetesdashboarddev/dashboard-metrics-sidecar:latest - ports: - - containerPort: 8000 - protocol: TCP - livenessProbe: - httpGet: - scheme: HTTP - path: / - port: 8000 - initialDelaySeconds: 30 - timeoutSeconds: 30 - volumeMounts: - - mountPath: /tmp - name: tmp-volume - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - runAsUser: 1001 - runAsGroup: 2001 - serviceAccountName: kubernetes-dashboard-head - nodeSelector: - "kubernetes.io/os": linux - # Comment the following tolerations if Dashboard must not be deployed on master - tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - volumes: - - name: tmp-volume - emptyDir: {} diff --git a/kubernetes/addons/dashboard/head/kustomization.yaml b/kubernetes/addons/dashboard/head/kustomization.yaml deleted file mode 100644 index 9e9cbb53f..000000000 --- a/kubernetes/addons/dashboard/head/kustomization.yaml +++ /dev/null @@ -1,2 +0,0 @@ -resources: -- dashboard.head.yaml diff --git a/kubernetes/addons/metrics-server/base/deployment.yaml b/kubernetes/addons/metrics-server/base/deployment.yaml index e4446ab70..cd712237e 100644 --- a/kubernetes/addons/metrics-server/base/deployment.yaml +++ b/kubernetes/addons/metrics-server/base/deployment.yaml @@ -18,7 +18,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: metrics-server - image: k8s.gcr.io/metrics-server/metrics-server:v0.6.0 + image: k8s.gcr.io/metrics-server/metrics-server:v0.6.3 imagePullPolicy: IfNotPresent args: - --cert-dir=/tmp diff --git a/kubernetes/addons/metrics-server/cn/kustomization.yaml b/kubernetes/addons/metrics-server/cn/kustomization.yaml index 805f59e80..eb9831ccb 100644 --- a/kubernetes/addons/metrics-server/cn/kustomization.yaml +++ b/kubernetes/addons/metrics-server/cn/kustomization.yaml @@ -1,7 +1,7 @@ resources: - "../base" images: - - name: k8s.gcr.io/metrics-server/metrics-server:v0.6.0 + - name: k8s.gcr.io/metrics-server/metrics-server:v0.6.3 # newName: ccr.ccs.tencentyun.com/gcr-mirror/metrics-server newName: registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-server - newTag: v0.6.0 + newTag: v0.6.3 diff --git a/kubernetes/docker-compose.bump.yml b/kubernetes/docker-compose.bump.yml index b67a01391..0ffe62d8f 100644 --- a/kubernetes/docker-compose.bump.yml +++ b/kubernetes/docker-compose.bump.yml @@ -8,7 +8,7 @@ services: image: quay.io/coreos/etcd:v3.5.8 k8s_dashboard: - image: kubernetesui/dashboard:v2.6.0 + image: kubernetesui/dashboard:v2.7.0 coredns: image: registry.k8s.io/coredns/coredns:v1.10.1 @@ -27,7 +27,7 @@ services: image: kong/kubernetes-ingress-controller:2.5.0 metrics_server: - image: registry.k8s.io/metrics-server/metrics-server:v0.6.0 + image: registry.k8s.io/metrics-server/metrics-server:v0.6.3 butane: image: quay.io/coreos/butane:v0.13.1 diff --git a/kubernetes/lnmp-k8s b/kubernetes/lnmp-k8s index 59bb30572..06aa3b51b 100755 --- a/kubernetes/lnmp-k8s +++ b/kubernetes/lnmp-k8s @@ -1300,9 +1300,12 @@ _k8s_install_systemd(){ # > /dev/null $(_sudo) mkdir -p ${K8S_ROOT}/etc/systemd/system/kube-.service.d + $(_sudo) mkdir -p /etc/systemd/system/systemd-journald.service.d $(_sudo) cp -r kube-.service.d/. ${K8S_ROOT}/etc/systemd/system/kube-.service.d/ + $(_sudo) cp -r systemd-journald.service.d/. /etc/systemd/system/systemd-journald.service.d/ + $(_sudo) mkdir -p /etc/systemd/system-environment-generators/ $(_sudo) cp -r ../system-environment-generators/. /etc/systemd/system-environment-generators/ fi # wsl2 end diff --git a/kubernetes/systemd/etc/cri-containerd/1.5/certs.d/registry.k8s.io/hosts.toml b/kubernetes/systemd/etc/cri-containerd/1.5/certs.d/registry.k8s.io/hosts.toml index f89536f49..ba763820e 100644 --- a/kubernetes/systemd/etc/cri-containerd/1.5/certs.d/registry.k8s.io/hosts.toml +++ b/kubernetes/systemd/etc/cri-containerd/1.5/certs.d/registry.k8s.io/hosts.toml @@ -15,6 +15,3 @@ server = "https://registry.k8s.io" [host."https://k8s.dockerproxy.com"] capabilities = ["pull", "resolve"] skip_verify = false -[host."https://k8s.gcr.io"] - capabilities = ["pull", "resolve"] - skip_verify = false diff --git a/kubernetes/systemd/etc/cri-containerd/1.6/certs.d/registry.k8s.io/hosts.toml b/kubernetes/systemd/etc/cri-containerd/1.6/certs.d/registry.k8s.io/hosts.toml index f89536f49..ba763820e 100644 --- a/kubernetes/systemd/etc/cri-containerd/1.6/certs.d/registry.k8s.io/hosts.toml +++ b/kubernetes/systemd/etc/cri-containerd/1.6/certs.d/registry.k8s.io/hosts.toml @@ -15,6 +15,3 @@ server = "https://registry.k8s.io" [host."https://k8s.dockerproxy.com"] capabilities = ["pull", "resolve"] skip_verify = false -[host."https://k8s.gcr.io"] - capabilities = ["pull", "resolve"] - skip_verify = false diff --git a/kubernetes/systemd/etc/cri-containerd/1.7/certs.d/registry.k8s.io/hosts.toml b/kubernetes/systemd/etc/cri-containerd/1.7/certs.d/registry.k8s.io/hosts.toml index f89536f49..ba763820e 100644 --- a/kubernetes/systemd/etc/cri-containerd/1.7/certs.d/registry.k8s.io/hosts.toml +++ b/kubernetes/systemd/etc/cri-containerd/1.7/certs.d/registry.k8s.io/hosts.toml @@ -15,6 +15,3 @@ server = "https://registry.k8s.io" [host."https://k8s.dockerproxy.com"] capabilities = ["pull", "resolve"] skip_verify = false -[host."https://k8s.gcr.io"] - capabilities = ["pull", "resolve"] - skip_verify = false diff --git a/kubernetes/systemd/etc/cri-containerd/1.7/config.toml b/kubernetes/systemd/etc/cri-containerd/1.7/config.toml index 58902664b..3808bc4e3 100644 --- a/kubernetes/systemd/etc/cri-containerd/1.7/config.toml +++ b/kubernetes/systemd/etc/cri-containerd/1.7/config.toml @@ -167,7 +167,7 @@ version = 2 key_model = "node" [plugins."io.containerd.grpc.v1.cri".registry] - config_path = "/opt/k8s/etc/cri-containerd/1.6/certs.d" + config_path = "/opt/k8s/etc/cri-containerd/1.7/certs.d" # [plugins."io.containerd.grpc.v1.cri".registry.auths] diff --git a/kubernetes/systemd/system/kubelet@.service b/kubernetes/systemd/system/kubelet@.service index 98e48ef43..e73a2476f 100644 --- a/kubernetes/systemd/system/kubelet@.service +++ b/kubernetes/systemd/system/kubelet@.service @@ -4,8 +4,8 @@ Documentation=https://github.com/kubernetes/kubernetes After=network-online.target network.target Wants=network-online.target network.target -Requires=kube-reset-kubelet.service -After=kube-reset-kubelet.service +# Requires=kube-reset-kubelet.service +# After=kube-reset-kubelet.service After=kube-apiserver.service diff --git a/kubernetes/systemd/system/systemd-journald.service.d/99-mount.conf b/kubernetes/systemd/system/systemd-journald.service.d/99-mount.conf new file mode 100644 index 000000000..072f39f26 --- /dev/null +++ b/kubernetes/systemd/system/systemd-journald.service.d/99-mount.conf @@ -0,0 +1,4 @@ +[Unit] +Requires=var-log-journal.mount +After=var-log-journal.mount +Wants=var-log-journal.mount diff --git a/kubernetes/wsl2/00-README.NODE.md b/kubernetes/wsl2/00-README.NODE.md index 507e9b6ac..51575098e 100644 --- a/kubernetes/wsl2/00-README.NODE.md +++ b/kubernetes/wsl2/00-README.NODE.md @@ -75,21 +75,7 @@ $ wsl -d wsl-k8s -- sh -xc 'debug=1 ./lnmp-k8s join 127.0.0.1 --containerd --ski ## kubectl -在 `WSL2` 中执行 - -```bash -$ wsl -d wsl-k8s - -$ kubectl -``` - -在 `Windows` 中执行 - -```powershell -$ ./wsl2/bin/kubectl-config-set-cluster - -$ kubectl -``` +请查看 [04-README.kubectl.md](04-README.kubectl.md) ## crictl diff --git a/kubernetes/wsl2/00-README.SERVER.md b/kubernetes/wsl2/00-README.SERVER.md index 38eef919a..b3a402d7a 100644 --- a/kubernetes/wsl2/00-README.SERVER.md +++ b/kubernetes/wsl2/00-README.SERVER.md @@ -66,9 +66,6 @@ $ wsl -d wsl-k8s -- apt install -y procps bash-completion iproute2 jq curl vim f $ wsl -d wsl-k8s -- apt install -y systemd dbus dbus-user-session udev ``` -bsd-mailx cron-daemon-common exim4-base exim4-config exim4-daemon-light laptop-detect libevent-2.1-7 libfribidi0 libgnutls-dane0 libidn12 liblockfile-bin liblockfile1 - libunbound8 - ### 复制配置文件 ```powershell diff --git a/kubernetes/wsl2/01-README.addons.md b/kubernetes/wsl2/01-README.addons.md index 4c49f941d..3d8812352 100644 --- a/kubernetes/wsl2/01-README.addons.md +++ b/kubernetes/wsl2/01-README.addons.md @@ -16,3 +16,5 @@ $ kubectl apply -k addons/cni/calico-eBPF-nft ### 2. 部署 CoreDNS 等其他组件 > 等待 CNI 处于 `Running` 状态，再部署其他组件。 + +* 具体请查看 `kubernetes/addons` 文件夹内容。 diff --git a/kubernetes/wsl2/02-README.systemd.md b/kubernetes/wsl2/02-README.systemd.md index b5bc8108b..5171d9b19 100644 --- a/kubernetes/wsl2/02-README.systemd.md +++ b/kubernetes/wsl2/02-README.systemd.md @@ -54,12 +54,3 @@ $ Invoke-WSLK8S systemctl status kubelet@cri-containerd # 你也可以执行其他命令供调试 # $ Invoke-WSLK8S CMD ``` - -## 禁用 systemd - -```powershell -$ New-Item \\wsl$\wsl-k8s\non-systemd - -# 启用 systemd -# $ Remove-Item \\wsl$\wsl-k8s\non-systemd -``` diff --git a/kubernetes/wsl2/04-README.kubectl.md b/kubernetes/wsl2/04-README.kubectl.md new file mode 100644 index 000000000..1ab29f17e --- /dev/null +++ b/kubernetes/wsl2/04-README.kubectl.md @@ -0,0 +1,25 @@ +# kubectl + +## 在 `WSL2` 中执行 + +```bash +$ wsl -d wsl-k8s + +$ kubectl +``` + +## 在 `Windows` 中执行 + +```powershell +$ ./wsl2/bin/kubectl-config-set-cluster + +$ kubectl +``` + +## 切换到其他 context + +```bash +$ kubectl config get-contexts + +$ kubectl config use-context wsl2 +``` diff --git a/kubernetes/wsl2/README.md b/kubernetes/wsl2/README.md index db42fb32d..aa4909645 100644 --- a/kubernetes/wsl2/README.md +++ b/kubernetes/wsl2/README.md @@ -2,4 +2,6 @@ ## [node](00-README.NODE.md) -## [systemd](02-README.systemd.md) +## 使用 [systemd](02-README.systemd.md) 启动组件 + +## [kubectl](04-README.kubectl.md) From 346a06e4439b71f159f362da99c6c9a135d8dd78 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 23 Jul 2023 09:59:51 +0800 Subject: [PATCH 11/42] [kubernetes] Test v1.28.0-beta.0 [sync git] Signed-off-by: Kang Huaishuai --- kubernetes/.github/workflows/setup-k8s.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index 0cf6c964d..44fc570e4 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -46,7 +46,7 @@ jobs: # next version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.28.0-alpha.2 + CI_KUBERNETES_VERSION: 1.28.0-beta.0 LNMP_K8S_GET: --url GENERATE_CLI_HELP: "true" @@ -543,8 +543,8 @@ jobs: | export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH BASE_BRANCH=v1.28.0-alpha.2-config - BASE_BRANCH=master - if [ $CI_KUBERNETES_VERSION != '1.28.0-alpha.2' ];then + # BASE_BRANCH=master + if [ $CI_KUBERNETES_VERSION != '1.28.0-beta.0' ];then exit 0 fi From 153310c4315f52a9293900f953f8164268904010 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 23 Jul 2023 10:23:52 +0800 Subject: [PATCH 12/42] [kubernetes] fixed cfssl docker image error [sync git] Signed-off-by: Kang Huaishuai --- kubernetes/.github/workflows/build-image.yml | 10 ---------- kubernetes/cfssl/Dockerfile | 19 ++----------------- kubernetes/wsl2/00-README.SERVER.md | 2 +- 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/kubernetes/.github/workflows/build-image.yml b/kubernetes/.github/workflows/build-image.yml index 0105d357b..5b14db20b 100644 --- a/kubernetes/.github/workflows/build-image.yml +++ b/kubernetes/.github/workflows/build-image.yml @@ -37,16 +37,6 @@ jobs: -t pcit-docker.pkg.coding.net/khs1994-docker/khs1994/k8s-cfssl \ --push \ --platform linux/amd64,linux/arm64 \ - --target dump \ - cfssl - - docker buildx build \ - --cache-from=ghcr.io/khs1994/k8s-cfssl:cache \ - -t khs1994/k8s-cfssl:all-in-one \ - -t ghcr.io/khs1994/k8s-cfssl:all-in-one \ - -t pcit-docker.pkg.coding.net/khs1994-docker/khs1994/k8s-cfssl:all-in-one \ - --push \ - --platform linux/amd64,linux/arm64 \ cfssl name: build khs1994/k8s-cfssl - name: build khs1994/fcos diff --git a/kubernetes/cfssl/Dockerfile b/kubernetes/cfssl/Dockerfile index a87a7acb6..b0808db7b 100644 --- a/kubernetes/cfssl/Dockerfile +++ b/kubernetes/cfssl/Dockerfile @@ -11,24 +11,13 @@ RUN set -x \ ; sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ ; apk add --no-cache curl \ ; apk add --no-cache cfssl \ + ; apk add --no-cache bash \ + ; apk add --no-cache openssl \ ; cp -a /usr/bin/cfssl /usr/bin/cfssljson /usr/local/bin \ ; curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl > /usr/local/bin/kubectl \ && apk del --no-network curl \ && chmod +x /usr/local/bin/cfssl /usr/local/bin/cfssljson /usr/local/bin/kubectl -FROM --platform=${TARGETPLATFORM} alpine:3.16 as dump - -LABEL maintainer="khs1994@khs1994.com" \ - version="1.27.0" - -COPY --from=0 /usr/local/bin /usr/local/bin - -ARG ALPINE_URL=dl-cdn.alpinelinux.org - -RUN set -x \ - ; sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ - ; apk add --no-cache bash openssl - WORKDIR /srv/cfssl VOLUME /srv/cfssl @@ -38,7 +27,3 @@ COPY *.yaml / COPY docker-entrypoint.sh / CMD bash /docker-entrypoint.sh - -FROM scratch as all-in-one - -COPY --from=1 / / diff --git a/kubernetes/wsl2/00-README.SERVER.md b/kubernetes/wsl2/00-README.SERVER.md index b3a402d7a..20d0eb62e 100644 --- a/kubernetes/wsl2/00-README.SERVER.md +++ b/kubernetes/wsl2/00-README.SERVER.md @@ -186,7 +186,7 @@ $env:CFSSL_ROOTFS="/wsl/wsl-k8s-data/cfssl/rootfs" $ wsl -d wsl-k8s -- sh -xc 'mkdir ${CFSSL_ROOT:?err}' $ . ../windows/sdk/dockerhub/rootfs # 该命令执行结果最后一行会给出<文件地址> -$ rootfs khs1994-docker/khs1994/k8s-cfssl -ref all-in-one -registry pcit-docker.pkg.coding.net +$ rootfs khs1994-docker/khs1994/k8s-cfssl -ref latest -registry pcit-docker.pkg.coding.net $ cp <文件地址> \\wsl$\wsl-k8s\"${env:CFSSL_ROOTFS}".tar.gz $ wsl -d wsl-k8s -- sh -xc 'mkdir ${CFSSL_ROOTFS:?err}' From ac27d1019bdebd8bd203c3b064886cc7dfa0ea26 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 23 Jul 2023 13:11:36 +0800 Subject: [PATCH 13/42] [Release] v20.10.27 Signed-off-by: Kang Huaishuai --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa007ad70..23d753374 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Compare -* https://github.com/khs1994-docker/lnmp/compare/v20.10.26...20.10 +* https://github.com/khs1994-docker/lnmp/compare/v20.10.26...v20.10.27 ### Bug fixes: From 1572bbb3550a93d35304db0dd2515daa5d95f9b5 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 23 Jul 2023 13:20:14 +0800 Subject: [PATCH 14/42] [PHP] Update to v8.2.5 v8.1.15 v8.0.28 Signed-off-by: Kang Huaishuai --- .env.example | 16 +- .env.example.ps1 | 2 +- .../setup-php/.github/workflows/ci.yaml | 6 +- .github/actions/setup-php/action.yml | 2 +- .github/actions/setup-php/package.json | 2 +- .github/workflows/release.yaml | 36 +- .pcit.yml | 2 +- CHANGELOG.md | 6 +- README.cn.md | 6 +- README.md | 6 +- app/demo/.drone.yml | 20 +- app/demo/.env.example | 6 +- app/demo/.github/workflows/ci.yml | 2 +- app/demo/.pcit.yml | 12 +- app/demo/Dockerfile | 4 +- app/demo/deploy/test.Dockerfile | 2 +- app/demo/docker-compose.yml | 6 +- app/demo/docker-workspace.yml | 4 +- app/laravel-demo/Dockerfile | 4 +- app/laravel-demo/Dockerfile.buildkit | 4 +- app/laravel-demo/Dockerfile.cdn | 4 +- docker-lnmp.override.example.yml | 8 +- docker-lnmp.yml | 4 +- docker-production.yml | 4 +- docker-workspace.example.yml | 4 +- dockerfile/php/.env.example | 13 +- dockerfile/php/.github/workflows/php_8_0.yml | 4 +- dockerfile/php/.github/workflows/php_8_1.yml | 4 +- dockerfile/php/.github/workflows/php_8_2.yml | 4 +- dockerfile/php/.github/workflows/php_8_3.yml | 200 +++++++++ .../php/.github/workflows/php_zz_tool.yml | 4 +- dockerfile/php/8.0/cli/Dockerfile | 4 +- dockerfile/php/8.0/composer/Dockerfile | 6 +- dockerfile/php/8.0/fpm/Dockerfile | 2 +- dockerfile/php/8.0/s6/Dockerfile | 2 +- dockerfile/php/8.0/swoole/Dockerfile | 6 +- dockerfile/php/8.0/unit/Dockerfile | 2 +- dockerfile/php/8.1/cli/Dockerfile | 4 +- dockerfile/php/8.1/composer/Dockerfile | 6 +- dockerfile/php/8.1/fpm/Dockerfile | 2 +- dockerfile/php/8.1/s6/Dockerfile | 2 +- dockerfile/php/8.1/swoole/Dockerfile | 6 +- dockerfile/php/8.1/unit/Dockerfile | 2 +- dockerfile/php/8.2/cli/Dockerfile | 8 +- dockerfile/php/8.2/composer/Dockerfile | 6 +- dockerfile/php/8.2/fpm/Dockerfile | 10 +- dockerfile/php/8.2/s6/Dockerfile | 2 +- dockerfile/php/8.2/swoole/Dockerfile | 8 +- dockerfile/php/8.2/unit/Dockerfile | 2 +- dockerfile/php/8.3/cli/Dockerfile | 416 ++++++++++++++++++ dockerfile/php/8.3/composer/Dockerfile | 63 +++ dockerfile/php/8.3/fpm/Dockerfile | 189 ++++++++ .../php/8.3/fpm/docker-compose.test.yml | 3 + dockerfile/php/8.3/s6/Dockerfile | 42 ++ dockerfile/php/8.3/swoole/Dockerfile | 57 +++ dockerfile/php/8.3/unit/Dockerfile | 63 +++ dockerfile/php/8.3/unit/docker-entrypoint.sh | 93 ++++ dockerfile/php/README.md | 26 +- dockerfile/php/doctum/Dockerfile | 2 +- dockerfile/php/nightly/composer/Dockerfile | 4 +- dockerfile/php/nightly/swoole/Dockerfile | 2 +- dockerfile/php/php-cs-fixer/Dockerfile | 4 +- dockerfile/php/phpmd/Dockerfile | 2 +- dockerfile/php/sync/docker-image-sync.json | 36 +- dockerfile/php/sync/manifest.txt | 36 +- dockerfile/php/tests/git/Dockerfile | 2 +- .../sync/docker-image-sync-by-docker.json | 4 +- docs/custom.md | 4 +- kubernetes/lnmp/php/base/lnmp-php.yaml | 2 +- lrew/nginx-unit/docker-compose.yml | 2 +- scripts/docker-compose.bump.yml | 4 +- vscode-remote/docker-workspace.yml | 4 +- .../lnmp-windows-pm-repo/composer/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/php/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/php/lwpm.yaml | 4 +- wsl/.env | 6 +- wsl/Dockerfile | 4 +- wsl/docker-compose.yml | 72 +-- wsl/lnmp-wsl-builder-php | 4 +- wsl/lnmp-wsl-builder-php-rhel | 4 +- wsl/wsl.phpbuilder.Dockerfile | 2 +- wsl/wsl.phpbuilder.rhel.Dockerfile | 2 +- wsl2/kernel.next.version | 2 +- 83 files changed, 1389 insertions(+), 260 deletions(-) create mode 100644 dockerfile/php/.github/workflows/php_8_3.yml create mode 100644 dockerfile/php/8.3/cli/Dockerfile create mode 100644 dockerfile/php/8.3/composer/Dockerfile create mode 100644 dockerfile/php/8.3/fpm/Dockerfile create mode 100644 dockerfile/php/8.3/fpm/docker-compose.test.yml create mode 100644 dockerfile/php/8.3/s6/Dockerfile create mode 100644 dockerfile/php/8.3/swoole/Dockerfile create mode 100644 dockerfile/php/8.3/unit/Dockerfile create mode 100644 dockerfile/php/8.3/unit/docker-entrypoint.sh diff --git a/.env.example b/.env.example index 6794bd5cd..a18ce6016 100644 --- a/.env.example +++ b/.env.example @@ -122,10 +122,10 @@ LNMP_NGINX_VERSION=1.23.3 LNMP_MYSQL_VERSION=8.0.33 -LNMP_PHP_VERSION=8.2.4 +LNMP_PHP_VERSION=8.2.5 # LNMP_PHP_VERSION=nightly -# EOL +# PHP EOL VERSION LNMP_PHP5_VERSION=5.6.37 LNMP_PHP56_VERSION=5.6.37 LNMP_PHP7_VERSION=7.4.33 @@ -134,11 +134,13 @@ LNMP_PHP71_VERSION=7.1.33 LNMP_PHP72_VERSION=7.2.34 LNMP_PHP73_VERSION=7.3.33 LNMP_PHP74_VERSION=7.4.33 -# EOL -LNMP_PHP8_VERSION=8.2.4 -LNMP_PHP80_VERSION=8.0.27 -LNMP_PHP81_VERSION=8.1.13 -LNMP_PHP82_VERSION=8.2.4 +# PHP EOL VERSION END + +LNMP_PHP8_VERSION=8.2.5 +LNMP_PHP80_VERSION=8.0.28 +LNMP_PHP81_VERSION=8.1.15 +LNMP_PHP82_VERSION=8.2.5 +LNMP_PHP83_VERSION=8.3.0beta1 LNMP_REDIS_VERSION=7.0.0 diff --git a/.env.example.ps1 b/.env.example.ps1 index f4dd3750e..269c45bc7 100644 --- a/.env.example.ps1 +++ b/.env.example.ps1 @@ -7,7 +7,7 @@ $CI_HOST="ci.khs1994.com:1218" # $ wsl -l $DistributionName="Ubuntu-22.04" -$LNMP_PHP_IMAGE="khs1994/php:8.2.4-composer-alpine" +$LNMP_PHP_IMAGE="khs1994/php:8.2.5-composer-alpine" $NGINX_PATH="C:/nginx" $PHP_PATH="C:/php" diff --git a/.github/actions/setup-php/.github/workflows/ci.yaml b/.github/actions/setup-php/.github/workflows/ci.yaml index 91916a63d..2e95105c2 100644 --- a/.github/actions/setup-php/.github/workflows/ci.yaml +++ b/.github/actions/setup-php/.github/workflows/ci.yaml @@ -10,9 +10,9 @@ jobs: matrix: php_version: - nightly - - 8.2.4 - - 8.1.13 - - 8.0.27 + - 8.2.5 + - 8.1.15 + - 8.0.28 # EOL - 7.4.33 - 7.3.33 diff --git a/.github/actions/setup-php/action.yml b/.github/actions/setup-php/action.yml index b9c09e2ce..73454a06f 100644 --- a/.github/actions/setup-php/action.yml +++ b/.github/actions/setup-php/action.yml @@ -6,7 +6,7 @@ author: 'khs1994' inputs: php_version: description: PHP version - default: "8.2.4" + default: "8.2.5" required: false php_type: description: php image type, fpm | composer | swoole | php-cs-fixer | doctum diff --git a/.github/actions/setup-php/package.json b/.github/actions/setup-php/package.json index 8560feac6..08cb8456f 100644 --- a/.github/actions/setup-php/package.json +++ b/.github/actions/setup-php/package.json @@ -12,7 +12,7 @@ }, "devDependencies": {}, "scripts": { - "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.2.4' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" + "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.2.5' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" }, "author": "", "license": "ISC" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5807d744c..98fc67bbc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,59 +16,59 @@ jobs: - 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.27-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.28-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-81 - DIST_FILE: khs1994-wsl-php81_8.1.13-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.15-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-nightly DIST_FILE: khs1994-wsl-php83_0.0.0-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-debian12-81 - DIST_FILE: khs1994-wsl-php81_8.1.13-debian-bookworm_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.15-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.27-ubuntu-bionic_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.28-ubuntu-bionic_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu1804-81 - DIST_FILE: khs1994-wsl-php81_8.1.13-ubuntu-bionic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.15-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.27-ubuntu-focal_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.28-ubuntu-focal_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2004-81 - DIST_FILE: khs1994-wsl-php81_8.1.13-ubuntu-focal_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.15-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.27-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.28-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-81 - DIST_FILE: khs1994-wsl-php81_8.1.13-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.15-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-nightly DIST_FILE: khs1994-wsl-php83_0.0.0-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2210-81 - DIST_FILE: khs1994-wsl-php81_8.1.13-ubuntu-kinetic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.15-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.27-1.el8.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.28-1.el8.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel8-81 - DIST_FILE: khs1994-wsl-php81-8.1.13-1.el8.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.15-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.27-1.el9.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.28-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel9-81 - DIST_FILE: khs1994-wsl-php81-8.1.13-1.el9.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.15-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky8-81 - DIST_FILE: khs1994-wsl-php81-8.1.13-1.el8.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.15-1.el8.rocky.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky9-81 - DIST_FILE: khs1994-wsl-php81-8.1.13-1.el9.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.15-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.27-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.28-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-81 - DIST_FILE: khs1994-wsl-php81-8.1.13-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.15-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 - JOB_NAME: wsl-php-builder-fc37-nightly diff --git a/.pcit.yml b/.pcit.yml index ea5b9fe9e..9934edb8b 100644 --- a/.pcit.yml +++ b/.pcit.yml @@ -4,7 +4,7 @@ workspace: steps: bash: - image: khs1994/php:8.2.4-composer-alpine + image: khs1994/php:8.2.5-composer-alpine run: - pwd - bash ./lnmp-docker diff --git a/CHANGELOG.md b/CHANGELOG.md index 23d753374..1604a35f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Changelog -## v20.10.27 +## v20.10.28 ### Compare -* https://github.com/khs1994-docker/lnmp/compare/v20.10.26...v20.10.27 +* https://github.com/khs1994-docker/lnmp/compare/v20.10.27...20.10 ### Bug fixes: @@ -14,4 +14,4 @@ ### Updates: -* [PHP `8.2.4` `8.1.13` `8.0.27`](https://www.php.net/ChangeLog-8.php#8.1.13) +* [PHP `8.2.5` `8.1.15` `8.0.28`](https://www.php.net/ChangeLog-8.php#8.1.15) diff --git a/README.cn.md b/README.cn.md index 40acc919f..87eb60d88 100644 --- a/README.cn.md +++ b/README.cn.md @@ -202,13 +202,13 @@ $ ./lnmp-docker down |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.23.3-alpine` | **1.23.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.4-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.5-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.3` | **10.11.3** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.4-fpm-alpine` | **8.2.4** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.4-composer-alpine`| **2.5.5** |`alpine:3.16` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.5-fpm-alpine` | **8.2.5** |`alpine:3.16` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.5-composer-alpine`| **2.5.8** |`alpine:3.16` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/README.md b/README.md index dab2f603e..db1967754 100644 --- a/README.md +++ b/README.md @@ -197,13 +197,13 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.23.3-alpine` | **1.23.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.4-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.5-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.3` | **10.11.3** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.4-fpm-alpine` | **8.2.4** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.4-composer-alpine`| **2.5.5** |`alpine:3.16` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.5-fpm-alpine` | **8.2.5** |`alpine:3.16` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.5-composer-alpine`| **2.5.8** |`alpine:3.16` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/app/demo/.drone.yml b/app/demo/.drone.yml index d812a4f44..f1cb95947 100644 --- a/app/demo/.drone.yml +++ b/app/demo/.drone.yml @@ -33,8 +33,8 @@ clone: steps: # install dep - name: install - # image: composer:2.5.5 - image: khs1994/php:8.2.4-composer-alpine + # image: composer:2.5.8 + image: khs1994/php:8.2.5-composer-alpine commands: - pwd - composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/ @@ -46,7 +46,7 @@ steps: # test script - name: script - image: khs1994/php:8.2.4-fpm-alpine + image: khs1994/php:8.2.5-fpm-alpine # pull: always | never | if-not-exists # detach: true # privileged: true @@ -92,7 +92,7 @@ steps: settings: # registry: docker.khs1994.com repo: khs1994/php - tags: 8.2.4-pro-${DRONE_TAG}-alpine + tags: 8.2.5-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com # build_args: @@ -142,7 +142,7 @@ steps: image: plugins/docker settings: repo: khs1994/php - tags: 8.2.4-pro-${DRONE_TAG}-alpine + tags: 8.2.5-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com username: @@ -179,7 +179,7 @@ steps: event: [ tag ] - name: after_success - image: khs1994/php:8.2.4-composer-alpine + image: khs1994/php:8.2.5-composer-alpine when: status: success commands: @@ -226,11 +226,11 @@ volumes: # matrix: # COMPOSER_VERSION: -# - 2.5.5 +# - 2.5.8 # PHP_VERSION: -# - 8.2.4 -# - 8.1.13 -# - 8.0.27 +# - 8.2.5 +# - 8.1.15 +# - 8.0.28 # # - 7.4.33 # # - 7.3.33 # # - 7.2.34 diff --git a/app/demo/.env.example b/app/demo/.env.example index b588f6584..1f55a8d69 100644 --- a/app/demo/.env.example +++ b/app/demo/.env.example @@ -1,8 +1,8 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION=8.2.4 -# PHP_VERSION=8.1.13 -# PHP_VERSION=8.0.27 +PHP_VERSION=8.2.5 +# PHP_VERSION=8.1.15 +# PHP_VERSION=8.0.28 # PHP_VERSION=7.4.33 # PHP_VERSION=7.3.33 # PHP_VERSION=7.2.34 diff --git a/app/demo/.github/workflows/ci.yml b/app/demo/.github/workflows/ci.yml index 5be9b3c4f..a9fd85206 100644 --- a/app/demo/.github/workflows/ci.yml +++ b/app/demo/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: test: strategy: matrix: - php_version: ["8.0.27","8.1.13","8.2.4"] + php_version: ["8.0.28","8.1.15","8.2.5"] runs-on: ubuntu-latest # needs: job steps: diff --git a/app/demo/.pcit.yml b/app/demo/.pcit.yml index d3d88a6e7..e26fdc126 100644 --- a/app/demo/.pcit.yml +++ b/app/demo/.pcit.yml @@ -16,7 +16,7 @@ steps: # install dep install: # image: composer:${COMPOSER_VERSION} - image: khs1994/php:8.2.4-composer-alpine + image: khs1994/php:8.2.5-composer-alpine shell: bash run: - pwd @@ -80,7 +80,7 @@ steps: event: tag after_success: - image: khs1994/php:8.2.4-composer-alpine + image: khs1994/php:8.2.5-composer-alpine shell: bash if: status: success @@ -127,11 +127,11 @@ services: jobs: COMPOSER_VERSION: - - 2.5.5 + - 2.5.8 PHP_VERSION: - - 8.2.4 - - 8.1.13 - - 8.0.27 + - 8.2.5 + - 8.1.15 + - 8.0.28 # - 7.4.33 # - 7.3.33 # - 7.2.34 diff --git a/app/demo/Dockerfile b/app/demo/Dockerfile index c8cfc1fef..fa01f5fda 100644 --- a/app/demo/Dockerfile +++ b/app/demo/Dockerfile @@ -9,7 +9,7 @@ # !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !! ARG NODE_VERSION=18.2.0 -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG NGINX_VERSION=1.15.0 ARG DOCKER_HUB_USERNAME=khs1994 @@ -28,7 +28,7 @@ RUN cd /app \ --no-plugins # 2.将项目打入 PHP 镜像 -# $ docker build -t khs1994/php:8.2.4-pro-GIT_TAG-alpine --target=php . +# $ docker build -t khs1994/php:8.2.5-pro-GIT_TAG-alpine --target=php . FROM ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION}-fpm-alpine as php diff --git a/app/demo/deploy/test.Dockerfile b/app/demo/deploy/test.Dockerfile index 4170e432a..df024b86e 100644 --- a/app/demo/deploy/test.Dockerfile +++ b/app/demo/deploy/test.Dockerfile @@ -2,7 +2,7 @@ # TEST PHP PROJECT BY Docker # -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG GIT_REPO={{ EXAMPLE_GIT_URL_EXAMPLE }}/{{ EXAMPLE_GIT_USERNAME_EXAMPLE }}/{{ EXAMPLE_GIT_REPO_EXAMPLE }}.git FROM khs1994/php:${PHP_VERSION}-composer-alpine diff --git a/app/demo/docker-compose.yml b/app/demo/docker-compose.yml index bf96ee6a4..60d3482ec 100644 --- a/app/demo/docker-compose.yml +++ b/app/demo/docker-compose.yml @@ -19,7 +19,7 @@ services: context: . dockerfile: deploy/test.Dockerfile args: - - PHP_VERSION=${PHP_VERSION:-8.2.4} + - PHP_VERSION=${PHP_VERSION:-8.2.5} image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE nginx: @@ -39,7 +39,7 @@ services: dockerfile: Dockerfile target: php args: - - PHP_VERSION=${PHP_VERSION:-8.2.4} + - PHP_VERSION=${PHP_VERSION:-8.2.5} - NODE_VERSION=${NODE_VERSION:-18.2.0} - NODE_REGISTRY=https://registry.npmmirror.com - image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.4}-pro-alpine + image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.5}-pro-alpine diff --git a/app/demo/docker-workspace.yml b/app/demo/docker-workspace.yml index 7656cb146..4ab4d5682 100644 --- a/app/demo/docker-workspace.yml +++ b/app/demo/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.4-composer-alpine + image: khs1994/php:8.2.5-composer-alpine networks: - backend volumes: @@ -67,7 +67,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.4-composer-alpine" + image: "khs1994/php:8.2.5-composer-alpine" command: [] # install | update npm: diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index 3ad3441e0..d9cf38801 100644 --- a/app/laravel-demo/Dockerfile +++ b/app/laravel-demo/Dockerfile @@ -14,12 +14,12 @@ # $ docker build --target=laravel -t khs1994/laravel:10 --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=18.2.0 -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG NGINX_VERSION=1.23.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.4-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.5-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.buildkit b/app/laravel-demo/Dockerfile.buildkit index 6da8ebbe6..9ce0012b1 100644 --- a/app/laravel-demo/Dockerfile.buildkit +++ b/app/laravel-demo/Dockerfile.buildkit @@ -16,12 +16,12 @@ # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.buildkit --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=18.2.0 -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG NGINX_VERSION=1.23.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.4-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.5-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY --link composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.cdn b/app/laravel-demo/Dockerfile.cdn index 4b6f9ee6b..337d8fcb9 100644 --- a/app/laravel-demo/Dockerfile.cdn +++ b/app/laravel-demo/Dockerfile.cdn @@ -15,12 +15,12 @@ # # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.cdn --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG NGINX_VERSION=1.23.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.4-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.5-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/docker-lnmp.override.example.yml b/docker-lnmp.override.example.yml index 78945879e..6af8db665 100644 --- a/docker-lnmp.override.example.yml +++ b/docker-lnmp.override.example.yml @@ -27,11 +27,11 @@ services: # php8: # &php8 # # ! change php8 default image - # image: username/php:${LNMP_PHP8_VERSION:-8.2.4}-fpm-alpine + # image: username/php:${LNMP_PHP8_VERSION:-8.2.5}-fpm-alpine # # ! cn mirror image - # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.4}-fpm-alpine + # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.5}-fpm-alpine # # ! s6 - # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.4}-s6-alpine + # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.5}-s6-alpine # # command: [] # # ! open more port # ports: @@ -74,7 +74,7 @@ services: swoole: << : *common - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.4}-swoole-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.5}-swoole-alpine # command 指令只需传入文件名即可 command: - /app/swoole/index.php diff --git a/docker-lnmp.yml b/docker-lnmp.yml index c04e731e3..66296d6c4 100644 --- a/docker-lnmp.yml +++ b/docker-lnmp.yml @@ -169,7 +169,7 @@ services: php8: &php8 << : [*common,*common-labels] - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.4}-fpm-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.5}-fpm-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} @@ -220,7 +220,7 @@ services: composer: << : [*common,*common-labels] restart: "no" - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.4}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.5}-composer-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} diff --git a/docker-production.yml b/docker-production.yml index e291ea977..1efc88436 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -74,7 +74,7 @@ x-build-debian: x-php-common: &default-php - image: khs1994/php:8.2.4-fpm-alpine + image: khs1994/php:8.2.5-fpm-alpine volumes: - ./app:/app - type: volume @@ -364,7 +364,7 @@ services: - *common - *default-labels - *default-php - # image: khs1994/php:8.2.4-s6-alpine + # image: khs1994/php:8.2.5-s6-alpine # entrypoint: # - /s6-init build: diff --git a/docker-workspace.example.yml b/docker-workspace.example.yml index 094d20bb2..b71ebb3d0 100644 --- a/docker-workspace.example.yml +++ b/docker-workspace.example.yml @@ -11,7 +11,7 @@ x-common: services: workspace: &workspace - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.4}-composer-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.5}-composer-alpine networks: - backend volumes: @@ -71,7 +71,7 @@ services: << : - *workspace - *common - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.4}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.5}-composer-alpine" command: [] # install | update npm: diff --git a/dockerfile/php/.env.example b/dockerfile/php/.env.example index 339bb58d0..e67b78841 100644 --- a/dockerfile/php/.env.example +++ b/dockerfile/php/.env.example @@ -1,8 +1,9 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION_82=8.2.4 -PHP_VERSION_81=8.1.13 -PHP_VERSION_80=8.0.27 +PHP_VERSION_83=8.3.0beta1 +PHP_VERSION_82=8.2.5 +PHP_VERSION_81=8.1.15 +PHP_VERSION_80=8.0.28 # EOL PHP_VERSION_74=7.4.33 PHP_VERSION_73=7.3.33 @@ -12,14 +13,14 @@ PHP_VERSION_70=7.0.33 PHP_VERSION_56=5.6.40 # https://github.com/composer/composer/tags -COMPOSER_VERSION=2.5.5 +COMPOSER_VERSION=2.5.8 # https://github.com/swoole/swoole-src/tags -SWOOLE_VERSION=5.0.0 +SWOOLE_VERSION=5.0.3 # https://github.com/nginx/unit/tags NGINX_UNIT_VERSION=1.30.0 # https://github.com/FriendsOfPHP/PHP-CS-Fixer/tags -PHP_CS_FIXER_VERSION=3.7.0 +PHP_CS_FIXER_VERSION=3.22.0 # https://github.com/sebastianbergmann/phpcpd/tags PHPCPD_VERSION=6.0.3 # https://github.com/theseer/phpdox/tags diff --git a/dockerfile/php/.github/workflows/php_8_0.yml b/dockerfile/php/.github/workflows/php_8_0.yml index f66796485..b6badf359 100644 --- a/dockerfile/php/.github/workflows/php_8_0.yml +++ b/dockerfile/php/.github/workflows/php_8_0.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.0.27" + default: "8.0.28" name: PHP_8.0 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_0_X FOLDER: "8.0" - PHP_TAG_VERSION: "8.0.27" + PHP_TAG_VERSION: "8.0.28" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_8_1.yml b/dockerfile/php/.github/workflows/php_8_1.yml index 8f2c2bf5f..81b49043a 100644 --- a/dockerfile/php/.github/workflows/php_8_1.yml +++ b/dockerfile/php/.github/workflows/php_8_1.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.1.13" + default: "8.1.15" name: PHP_8.1 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.13" + PHP_TAG_VERSION: "8.1.15" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_8_2.yml b/dockerfile/php/.github/workflows/php_8_2.yml index b1c451963..ef1ba4e18 100644 --- a/dockerfile/php/.github/workflows/php_8_2.yml +++ b/dockerfile/php/.github/workflows/php_8_2.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.2.4" + default: "8.2.5" name: PHP_8.2 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_2_X FOLDER: "8.2" - PHP_TAG_VERSION: "8.2.4" + PHP_TAG_VERSION: "8.2.5" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_8_3.yml b/dockerfile/php/.github/workflows/php_8_3.yml new file mode 100644 index 000000000..0b5bbeeb7 --- /dev/null +++ b/dockerfile/php/.github/workflows/php_8_3.yml @@ -0,0 +1,200 @@ +on: + push: + branches: + - master + tags: + - '*' + workflow_dispatch: + inputs: + PHP_VERSION: + description: php version + required: true + default: "8.3.0beta1" + +name: PHP_8.3 + +env: + PHP_CUSTOM_VERSION: ${{ github.event.inputs.PHP_VERSION }} + +defaults: + run: + shell: bash --noprofile --norc -exo pipefail {0} + +jobs: + build: + name: Build + strategy: + max-parallel: 1 + matrix: + # TYPE: [CLI, FPM, UNIT, COMPOSER, SWOOLE, PPM, SUPERVISORD] + TYPE: [CLI, FPM, COMPOSER, S6, UNIT, SWOOLE] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@main + with: + fetch-depth: 2 + - run: | + env + docker --version + docker compose version + name: 'manifest' + - run: | + echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin + # echo ${DOCKER_PASSWORD} | docker login -u ${TENCENT_DOCKER_USERNAME} --password-stdin uswccr.ccs.tencentyun.com + echo ${DOCKER_PASSWORD} | docker login -u ${ALIYUN_DOCKER_USERNAME} --password-stdin registry.us-east-1.aliyuncs.com + echo ${GHCR_IO_TOKEN} | docker login -u khs1994 --password-stdin ghcr.io + echo ${CODING_DOCKER_PASSWORD} | docker login -u khs1994-1601432822176 --password-stdin pcit-docker.pkg.coding.net + name: 'Docker Login' + env: + DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} + DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}} + TENCENT_DOCKER_USERNAME: ${{secrets.TENCENT_DOCKER_USERNAME}} + ALIYUN_DOCKER_USERNAME: ${{secrets.ALIYUN_DOCKER_USERNAME}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + GHCR_IO_TOKEN: ${{secrets.GHCR_IO_TOKEN}} + CODING_DOCKER_PASSWORD: ${{secrets.CODING_DOCKER_PASSWORD}} + - uses: docker-practice/actions-setup-docker@master + with: + docker_channel: test + docker_version: "20.10" + - run: | + docker --version + docker compose version + docker buildx version + docker + name: 'install-after-manifest' + - run: | + cp .env.example .env + + if [ -n "${PHP_CUSTOM_VERSION}" ];then + export PHP_TAG_VERSION=$PHP_CUSTOM_VERSION + fi + + echo $GITHUB_REF | grep -q 'refs/tags/' && IS_TAG_EVENT=1 || true + + if ! [ -n "${IS_TAG_EVENT}" -o "${GITHUB_EVENT_NAME}" = 'workflow_dispatch' ];then \ + export PLATFORM=linux/amd64; \ + if [ "$PHP_VERSION" = 8_X_X -o "$PHP_VERSION" = nightly ];then \ + export PLATFORM=linux/amd64,linux/arm64,linux/arm/v7; \ + IS_PUSH=--push; \ + mirror="${add_mirror}"; \ + else \ + IS_PUSH=--push; \ + DOCKER_HUB_USERNAME=$DOCKER_HUB_USERNAME_TEST; \ + fi; \ + else \ + IS_PUSH=--push \ + && mirror="${add_mirror}"; \ + fi + + VCS_REF=`git rev-parse --short HEAD` + CACHE_IMAGE=ghcr.io/${DOCKER_HUB_USERNAME}/php + # CACHE_IMAGE=${DOCKER_HUB_USERNAME}/php + + options="--build-arg USERNAME=$DOCKER_HUB_USERNAME \ + --build-arg VCS_REF=$VCS_REF \ + --build-arg PHP_VERSION=$PHP_TAG_VERSION \ + --cache-from=khs1994/php:${FOLDER}-arm-${TYPE,,}-cache \ + --cache-from=${CACHE_IMAGE}:${FOLDER}-${TYPE,,}-cache \ + --cache-to=${CACHE_IMAGE}:${FOLDER}-${TYPE,,}-cache" + + if [ "$TYPE" = "UNIT" ];then + echo ::group::Build $TYPE + docker buildx build $options \ + --build-arg ALPINE_URL=${ALPINE_URL:-dl-cdn.alpinelinux.org} \ + -t $DOCKER_HUB_USERNAME/php:${PHP_TAG_VERSION}-unit-alpine \ + $(for item in `echo $mirror`;do echo " -t ${item}:${PHP_TAG_VERSION}-unit-alpine ";done) \ + --platform ${PLATFORM} ${IS_PUSH} ${FOLDER}/unit + echo ::endgroup:: + fi + + if [ "$TYPE" = "SUPERVISORD" ];then + echo ::group::Build $TYPE + docker buildx build $options \ + --build-arg ALPINE_URL=${ALPINE_URL:-dl-cdn.alpinelinux.org} \ + -t $DOCKER_HUB_USERNAME/php:${PHP_TAG_VERSION}-supervisord-alpine \ + $(for item in `echo $mirror`;do echo " -t ${item}:${PHP_TAG_VERSION}-supervisord-alpine ";done) \ + --platform ${PLATFORM} ${IS_PUSH} ${FOLDER}/supervisord + echo ::endgroup:: + fi + + if [ "$TYPE" = "COMPOSER" ];then + echo ::group::Build $TYPE + docker buildx build $options \ + --build-arg ALPINE_URL=${ALPINE_URL:-dl-cdn.alpinelinux.org} \ + -t $DOCKER_HUB_USERNAME/php:${PHP_TAG_VERSION}-composer-alpine \ + $(for item in `echo $mirror`;do echo " -t ${item}:${PHP_TAG_VERSION}-composer-alpine ";done) \ + --platform ${PLATFORM} ${IS_PUSH} ${FOLDER}/composer + echo ::endgroup:: + fi + + if [ "$TYPE" = "SINGLE" ];then + echo ::group::Build $TYPE + docker buildx build $options \ + --build-arg ALPINE_URL=${ALPINE_URL:-dl-cdn.alpinelinux.org} \ + -t $DOCKER_HUB_USERNAME/php:${PHP_TAG_VERSION}-single-alpine \ + ${IS_PUSH} ${FOLDER}/single + echo ::endgroup:: + fi + + if [ "$TYPE" = "SWOOLE" ];then + echo ::group::Build $TYPE + docker buildx build $options \ + --build-arg ALPINE_URL=${ALPINE_URL:-dl-cdn.alpinelinux.org} \ + -t $DOCKER_HUB_USERNAME/php:${PHP_TAG_VERSION}-swoole-alpine \ + $(for item in `echo $mirror`;do echo " -t ${item}:${PHP_TAG_VERSION}-swoole-alpine ";done) \ + --platform ${PLATFORM} ${IS_PUSH} ${FOLDER}/swoole + echo ::endgroup:: + fi + + if [ "$TYPE" = "FPM" ];then + echo ::group::Build $TYPE + docker buildx build $options \ + --build-arg ALPINE_URL=${ALPINE_URL:-dl-cdn.alpinelinux.org} \ + --target=php -t $DOCKER_HUB_USERNAME/php:${PHP_TAG_VERSION}-fpm-alpine \ + $(for item in `echo $mirror`;do echo " -t ${item}:${PHP_TAG_VERSION}-fpm-alpine ";done) \ + ${fpmTagOptions} \ + --platform ${PLATFORM} ${IS_PUSH} ${FOLDER}/fpm + echo ::endgroup:: + fi + + if [ "$TYPE" = "CLI" ];then + echo ::group::Build $TYPE + docker buildx build $options \ + --build-arg ALPINE_URL=${ALPINE_URL:-dl-cdn.alpinelinux.org} \ + -t $DOCKER_HUB_USERNAME/php:${PHP_TAG_VERSION}-cli-alpine \ + $(for item in `echo $mirror`;do echo " -t ${item}:${PHP_TAG_VERSION}-cli-alpine ";done) \ + --platform ${PLATFORM} ${IS_PUSH} ${FOLDER}/cli + echo ::endgroup:: + fi + + if [ "$TYPE" = "S6" ];then + echo ::group::Build $TYPE + docker buildx build $options \ + --build-arg ALPINE_URL=${ALPINE_URL:-dl-cdn.alpinelinux.org} \ + -t $DOCKER_HUB_USERNAME/php:${PHP_TAG_VERSION}-s6-alpine \ + $(for item in `echo $mirror`;do echo " -t ${item}:${PHP_TAG_VERSION}-s6-alpine ";done) \ + --platform ${PLATFORM} ${IS_PUSH} ${FOLDER}/s6 + echo ::endgroup:: + fi + + if [ "$TYPE" = "PPM" ];then + echo ::group::Build $TYPE + docker buildx build $options \ + --build-arg ALPINE_URL=${ALPINE_URL:-dl-cdn.alpinelinux.org} \ + -t $DOCKER_HUB_USERNAME/php:${PHP_TAG_VERSION}-ppm-alpine \ + $(for item in `echo $mirror`;do echo " -t ${item}:${PHP_TAG_VERSION}-ppm-alpine ";done) \ + --platform ${PLATFORM} ${IS_PUSH} ${FOLDER}/ppm + echo ::endgroup:: + fi + env: + GITHUB_EVENT_NAME: ${{github.event_name}} + DOCKER_HUB_USERNAME: khs1994 + DOCKER_HUB_USERNAME_TEST: lrew + PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 + PHP_VERSION: 8_3_X + FOLDER: "8.3" + PHP_TAG_VERSION: "8.3.0beta1" + TYPE: ${{ matrix.TYPE }} + add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php + name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_zz_tool.yml b/dockerfile/php/.github/workflows/php_zz_tool.yml index 9014faebf..73c7cf837 100644 --- a/dockerfile/php/.github/workflows/php_zz_tool.yml +++ b/dockerfile/php/.github/workflows/php_zz_tool.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.1.13" + default: "8.1.15" name: PHP_TOOL @@ -180,7 +180,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.13" + PHP_TAG_VERSION: "8.1.15" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/8.0/cli/Dockerfile b/dockerfile/php/8.0/cli/Dockerfile index 3843e6603..34f6bcd21 100644 --- a/dockerfile/php/8.0/cli/Dockerfile +++ b/dockerfile/php/8.0/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.27 +ARG PHP_VERSION=8.0.28 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.0.27 +ARG PHP_VERSION=8.0.28 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.0/composer/Dockerfile b/dockerfile/php/8.0/composer/Dockerfile index ec3c5b4f9..73d41d802 100644 --- a/dockerfile/php/8.0/composer/Dockerfile +++ b/dockerfile/php/8.0/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.27 +ARG PHP_VERSION=8.0.28 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli @@ -19,12 +19,12 @@ ENV COMPOSER_DEP_APKS \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ COMPOSER_NO_INTERACTION=1 \ - COMPOSER_VERSION=2.5.5 \ + COMPOSER_VERSION=2.5.8 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.5.5,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.5.8,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ diff --git a/dockerfile/php/8.0/fpm/Dockerfile b/dockerfile/php/8.0/fpm/Dockerfile index d78ae5ac8..eb6a0a8bc 100644 --- a/dockerfile/php/8.0/fpm/Dockerfile +++ b/dockerfile/php/8.0/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.27 +ARG PHP_VERSION=8.0.28 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.16 as php diff --git a/dockerfile/php/8.0/s6/Dockerfile b/dockerfile/php/8.0/s6/Dockerfile index 881518fa6..6c71779a0 100644 --- a/dockerfile/php/8.0/s6/Dockerfile +++ b/dockerfile/php/8.0/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.27 +ARG PHP_VERSION=8.0.28 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.0/swoole/Dockerfile b/dockerfile/php/8.0/swoole/Dockerfile index 3e8ab4465..455ae456a 100644 --- a/dockerfile/php/8.0/swoole/Dockerfile +++ b/dockerfile/php/8.0/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.27 +ARG PHP_VERSION=8.0.28 ARG USERNAME=khs1994 ARG BASE=cli @@ -22,12 +22,12 @@ ENV PECL_EXTENSION \ swoole \ ${PECL_EXTENSION_EXTRA:-} -ENV SWOOLE_VERSION=v5.0.0 +ENV SWOOLE_VERSION=v5.0.3 # ENV SWOOLE_VERSION=master ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.0.27-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.0.28-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.0/unit/Dockerfile b/dockerfile/php/8.0/unit/Dockerfile index 7188166d2..524be8967 100644 --- a/dockerfile/php/8.0/unit/Dockerfile +++ b/dockerfile/php/8.0/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.27 +ARG PHP_VERSION=8.0.28 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/8.1/cli/Dockerfile b/dockerfile/php/8.1/cli/Dockerfile index a20dde38d..f4e5c7be7 100644 --- a/dockerfile/php/8.1/cli/Dockerfile +++ b/dockerfile/php/8.1/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.13 +ARG PHP_VERSION=8.1.15 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.1.13 +ARG PHP_VERSION=8.1.15 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.1/composer/Dockerfile b/dockerfile/php/8.1/composer/Dockerfile index b9096b65d..53a7d3fca 100644 --- a/dockerfile/php/8.1/composer/Dockerfile +++ b/dockerfile/php/8.1/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.13 +ARG PHP_VERSION=8.1.15 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli @@ -19,12 +19,12 @@ ENV COMPOSER_DEP_APKS \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ COMPOSER_NO_INTERACTION=1 \ - COMPOSER_VERSION=2.5.5 \ + COMPOSER_VERSION=2.5.8 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.5.5,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.5.8,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ diff --git a/dockerfile/php/8.1/fpm/Dockerfile b/dockerfile/php/8.1/fpm/Dockerfile index 13e5cd510..210c14cfb 100644 --- a/dockerfile/php/8.1/fpm/Dockerfile +++ b/dockerfile/php/8.1/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.13 +ARG PHP_VERSION=8.1.15 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php diff --git a/dockerfile/php/8.1/s6/Dockerfile b/dockerfile/php/8.1/s6/Dockerfile index 9d5467e70..a7cf62038 100644 --- a/dockerfile/php/8.1/s6/Dockerfile +++ b/dockerfile/php/8.1/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.13 +ARG PHP_VERSION=8.1.15 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.1/swoole/Dockerfile b/dockerfile/php/8.1/swoole/Dockerfile index 3f2787a4c..6483b172d 100644 --- a/dockerfile/php/8.1/swoole/Dockerfile +++ b/dockerfile/php/8.1/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.13 +ARG PHP_VERSION=8.1.15 ARG USERNAME=khs1994 ARG BASE=cli @@ -22,12 +22,12 @@ ENV PECL_EXTENSION \ swoole \ ${PECL_EXTENSION_EXTRA:-} -ENV SWOOLE_VERSION=v5.0.0 +ENV SWOOLE_VERSION=v5.0.3 # ENV SWOOLE_VERSION=master ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.1.13-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.1.15-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.1/unit/Dockerfile b/dockerfile/php/8.1/unit/Dockerfile index 56f247f82..eb24a9797 100644 --- a/dockerfile/php/8.1/unit/Dockerfile +++ b/dockerfile/php/8.1/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.13 +ARG PHP_VERSION=8.1.15 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/8.2/cli/Dockerfile b/dockerfile/php/8.2/cli/Dockerfile index 8c455e2a7..17e16967a 100644 --- a/dockerfile/php/8.2/cli/Dockerfile +++ b/dockerfile/php/8.2/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG ALPINE_URL=dl-cdn.alpinelinux.org @@ -366,8 +366,8 @@ ENV PECL_RUN_DEPS \ ENV PECL_EXTENSION \ # mongodb \ # https://github.com/mongodb/mongo-php-driver/archive/master.tar.gz \ - # igbinary \ - https://github.com/igbinary/igbinary/archive/master.tar.gz \ + igbinary \ + # https://github.com/igbinary/igbinary/archive/master.tar.gz \ # redis \ https://github.com/phpredis/phpredis/archive/develop.tar.gz \ memcached \ diff --git a/dockerfile/php/8.2/composer/Dockerfile b/dockerfile/php/8.2/composer/Dockerfile index bbb91fe10..b3c61b73c 100644 --- a/dockerfile/php/8.2/composer/Dockerfile +++ b/dockerfile/php/8.2/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli @@ -19,12 +19,12 @@ ENV COMPOSER_DEP_APKS \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ COMPOSER_NO_INTERACTION=1 \ - COMPOSER_VERSION=2.5.5 \ + COMPOSER_VERSION=2.5.8 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.5.5,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.5.8,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ diff --git a/dockerfile/php/8.2/fpm/Dockerfile b/dockerfile/php/8.2/fpm/Dockerfile index 2ef6aac1e..3960066e5 100644 --- a/dockerfile/php/8.2/fpm/Dockerfile +++ b/dockerfile/php/8.2/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php @@ -46,10 +46,10 @@ ENV PHP_EXTENSION \ ENV PECL_EXTENSION \ # mongodb \ # https://github.com/mongodb/mongo-php-driver/archive/master.tar.gz \ - # igbinary \ - https://github.com/igbinary/igbinary/archive/master.tar.gz \ - # redis \ - https://github.com/phpredis/phpredis/archive/develop.tar.gz \ + igbinary \ + # https://github.com/igbinary/igbinary/archive/master.tar.gz \ + redis \ + # https://github.com/phpredis/phpredis/archive/develop.tar.gz \ memcached \ # 安装测试版的扩展，可以在扩展名后加 -beta # xdebug-beta \ diff --git a/dockerfile/php/8.2/s6/Dockerfile b/dockerfile/php/8.2/s6/Dockerfile index 457d71393..a0eb4b714 100644 --- a/dockerfile/php/8.2/s6/Dockerfile +++ b/dockerfile/php/8.2/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.2/swoole/Dockerfile b/dockerfile/php/8.2/swoole/Dockerfile index 9e269ee16..902b85f2e 100644 --- a/dockerfile/php/8.2/swoole/Dockerfile +++ b/dockerfile/php/8.2/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG USERNAME=khs1994 ARG BASE=cli @@ -22,12 +22,12 @@ ENV PECL_EXTENSION \ swoole \ ${PECL_EXTENSION_EXTRA:-} -# ENV SWOOLE_VERSION=v5.0.0 -ENV SWOOLE_VERSION=master +ENV SWOOLE_VERSION=v5.0.3 +# ENV SWOOLE_VERSION=master ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.2.4-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.2.5-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.2/unit/Dockerfile b/dockerfile/php/8.2/unit/Dockerfile index 46f6dd0e3..68ad40e8c 100644 --- a/dockerfile/php/8.2/unit/Dockerfile +++ b/dockerfile/php/8.2/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/8.3/cli/Dockerfile b/dockerfile/php/8.3/cli/Dockerfile new file mode 100644 index 000000000..bd49cefe3 --- /dev/null +++ b/dockerfile/php/8.3/cli/Dockerfile @@ -0,0 +1,416 @@ +# syntax=docker/dockerfile:labs +ARG PHP_VERSION=8.3.0beta1 + +FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream + +FROM --platform=$TARGETPLATFORM alpine:3.18 + +LABEL maintainer="khs1994-docker/lnmp " + +ENV TZ=Asia/Shanghai \ + APP_ENV=development + +ARG PHP_VERSION=8.3.0beta1 + +ARG ALPINE_URL=dl-cdn.alpinelinux.org + +ARG PHP_EXTENSION_EXTRA + +ARG PECL_EXTENSION_EXTRA + +ARG APK_EXTRA + +ARG APK_DEV_EXTRA + +ARG PHP_EXTRA_CONFIGURE_ARGS_NEW + +# dependencies required for running "phpize" +# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) +ENV PHPIZE_DEPS \ + autoconf \ + dpkg-dev dpkg \ + file \ + g++ \ + gcc \ + libc-dev \ + make \ + pkgconf \ + re2c \ + bison + +# persistent / runtime deps +RUN set -ex \ + && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ + && apk add --no-cache \ + ca-certificates \ + curl \ + tar \ + xz \ +# https://github.com/docker-library/php/issues/494 + openssl \ + bash \ + tzdata \ + less \ +# ensure www-data user exists +# RUN set -x \ + && adduser -u 82 -D -S -G www-data www-data +# 82 is the standard uid/gid for "www-data" in Alpine +# http://git.alpinelinux.org/cgit/aports/tree/main/apache2/apache2.pre-install?h=v3.3.2 +# http://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.3.2 +# http://git.alpinelinux.org/cgit/aports/tree/main/nginx-initscripts/nginx-initscripts.pre-install?h=v3.3.2 + +ENV PHP_INI_DIR /usr/local/etc/php +# RUN mkdir -p $PHP_INI_DIR/conf.d + +#### +ENV PHP_EXTRA_CONFIGURE_ARGS \ +# https://github.com/docker-library/php/pull/1259 + # --enable-phpdbg \ + # --enable-phpdbg-readline \ + --disable-phpdbg \ + # --enable-fpm \ + # --with-fpm-user=www-data \ + # --with-fpm-group=www-data \ + # https://github.com/docker-library/php/issues/510 + --enable-embed=shared \ + --disable-cgi \ + --with-gettext=shared \ + --enable-gd=shared \ + --with-freetype \ + --disable-gd-jis-conv \ + --with-jpeg \ + --with-webp \ + --with-xpm \ + --with-avif \ + --with-pdo-mysql=shared \ + --with-pdo-pgsql=shared \ + # --with-xsl=shared \ + --enable-bcmath=shared \ + --enable-pcntl=shared \ + --with-external-pcre \ + --enable-shmop=shared \ + # --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-calendar=shared \ + --enable-intl=shared \ + --enable-exif=shared \ + --with-bz2=shared \ + # --with-tidy=shared \ + --with-gmp=shared \ + --with-kerberos \ + --with-imap=shared \ + --with-imap-ssl \ + --with-enchant=shared \ + --enable-fileinfo=shared \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-pspell=shared \ + --enable-shmop=shared \ + # --with-snmp=shared \ + --with-mysqli=shared \ + --with-pgsql=shared \ + --enable-ctype=shared \ + --enable-dom=shared \ + --enable-pdo=shared \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-session=shared \ + --enable-simplexml=shared \ + --enable-tokenizer=shared \ + --enable-xml=shared \ + --enable-xmlreader=shared \ + --enable-xmlwriter=shared \ + --with-ffi=shared \ + --with-zip=shared \ + ${PHP_EXTRA_CONFIGURE_ARGS_NEW:-} +#### + +# Apply stack smash protection to functions using local buffers and alloca() +# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64) +# Enable optimization (-O2) +# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default) +# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated) +# https://github.com/docker-library/php/issues/272 +ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" +ENV PHP_CPPFLAGS="$PHP_CFLAGS" +ENV PHP_LDFLAGS="-Wl,-O1 -pie" + +# ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F + +ENV PHP_VERSION=${PHP_VERSION} +# ENV PHP_URL="https://www.php.net/get/php-7.4.22.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.4.22.tar.xz.asc/from/this/mirror" +# ENV PHP_SHA256="da1a705c0bc46410e330fc6baa967666c8cd2985378fb9707c01a8e33b01d985" PHP_MD5="" + +# COPY --from=php:alpine /usr/local/bin/docker-php-* /usr/local/bin/ + +# COPY --from=php:alpine /usr/local/bin/docker-php-source /usr/local/bin/ +# COPY --from=php:alpine /usr/local/bin/docker-php-entrypoint /usr/local/bin/ +# COPY --from=php:alpine /usr/local/bin/docker-php-ext-configure /usr/local/bin/ +# COPY --from=php:alpine /usr/local/bin/docker-php-ext-enable /usr/local/bin/ +# COPY --from=php:alpine /usr/local/bin/docker-php-ext-install /usr/local/bin/ + +RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \ + --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \ + set -xe \ + && mkdir -p /usr/src \ + && cp /usr/local/src/* /usr/src/ \ + && export PATH=$PATH:/opt/bin \ + ; mkdir -p $PHP_INI_DIR/conf.d \ + && cp /opt/bin/docker-php-entrypoint /usr/local/bin \ + && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ + argon2-dev \ + coreutils \ + curl-dev \ + gnu-libiconv-dev \ + libsodium-dev \ + libxml2-dev \ + linux-headers \ + oniguruma-dev \ + openssl-dev \ + readline-dev \ + sqlite-dev \ + cyrus-sasl-dev \ + postgresql-dev \ + libzip-dev \ + zlib-dev \ + libpng-dev \ + freetype-dev \ + libjpeg-turbo-dev \ + libxpm-dev \ + libwebp-dev \ + libexif-dev \ + # libxslt-dev \ + gmp-dev \ + bzip2-dev \ + enchant2-dev \ + imap-dev \ + gettext-dev \ + icu-dev \ + krb5-dev \ + aspell-dev \ + openldap-dev \ + pcre2-dev \ + # tidyhtml-dev \ + # net-snmp-dev \ + openldap-dev \ + libavif-dev \ + ${APK_DEV_EXTRA:-} \ + \ + && rm -vf /usr/include/iconv.h \ + && export CFLAGS="$PHP_CFLAGS" \ + CPPFLAGS="$PHP_CPPFLAGS" \ + LDFLAGS="$PHP_LDFLAGS" \ + && docker-php-source extract \ + && cd /usr/src/php \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + \ + # && apk add --no-cache patch \ + # && { \ + # echo "--- a/build/php.m4"; \ + # } | tee 1.diff \ + # && patch -p1 < 1.diff \ + # && apk del --no-network patch \ + # && rm -rf 1.diff \ + # && ./buildconf --force \ + \ + && ./configure \ + --build="$gnuArch" \ + --with-config-file-path="$PHP_INI_DIR" \ + --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ + \ +# make sure invalid --configure-flags are fatal errors instead of just warnings + --enable-option-checking=fatal \ + \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ +# https://github.com/docker-library/php/issues/822 + --with-pic \ + \ +# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) + --enable-ftp=shared \ +# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) + --enable-mbstring=shared \ +# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) + --enable-mysqlnd=shared \ +# https://wiki.php.net/rfc/argon2_password_hash (7.2+) + --with-password-argon2 \ +# https://wiki.php.net/rfc/libsodium + --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=shared,/usr \ + --with-sqlite3=shared,/usr \ + \ + --with-curl=shared \ + --with-iconv=/usr \ + --with-openssl=shared \ + --with-system-ciphers \ + --with-readline \ + --with-zlib \ + \ +# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") + # --with-pear \ + \ +# bundled pcre does not support JIT on s390x +# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT + $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ + \ + $PHP_EXTRA_CONFIGURE_ARGS \ + && make -j "$(nproc)" \ + && find -type f -name '*.a' -delete \ + && make install \ + && cp -v php.ini-* "$PHP_INI_DIR/" \ + && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ +# && docker-php-source delete \ + \ + && docker-php-ext-enable bcmath \ + bz2 \ + calendar \ + enchant \ + # exif \ + fileinfo \ + # gd \ + gettext \ + gmp \ + imap \ + intl \ + ldap \ + pcntl \ + openssl \ + mysqlnd \ + # mysqli \ + pdo \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + pspell \ + shmop \ + # snmp \ + # soap \ + sodium \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + # tidy \ + # xsl \ + # opcache 已默认安装，需要自行载入 + opcache \ + ctype \ + dom \ + pdo_sqlite \ + phar \ + posix \ + session \ + simplexml \ + sqlite3 \ + tokenizer \ + xml \ + xmlreader \ + xmlwriter \ + ftp \ + mbstring \ + curl \ + zip \ + ffi \ + ${PHP_EXTENSION_EXTRA:-} \ + && echo "extension=exif" > $PHP_INI_DIR/conf.d/docker-php-ext-z-exif.ini \ + && echo "extension=gd" > $PHP_INI_DIR/conf.d/docker-php-ext-z-gd.ini \ + && echo "extension=mysqli" > $PHP_INI_DIR/conf.d/docker-php-ext-z-mysqli.ini \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --no-cache $runDeps \ + \ + && strip --strip-all /usr/local/lib/libphp.so \ + && { find $(php-config --extension-dir) -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ + && apk del --no-network .build-deps \ + && rm -rf /usr/local/include/php/TSRM/tsrm_win32.h \ + /usr/local/include/php/TSRM/tsrm_config.w32.h \ + /usr/local/include/php/Zend/zend_config.w32.h \ + /usr/local/include/php/ext/mysqlnd/config-win.h \ + /usr/local/include/php/ext/standard/winver.h \ + /usr/local/php/man \ + \ +# smoke test + && php --version \ +# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) +# RUN docker-php-ext-enable sodium + \ +# 创建日志文件夹 + && ln -sf /dev/stderr /var/log/xdebug-remote.log \ + && rm -rf /usr/src/* + +ENV PECL_BUILD_DEPS \ + libmemcached-dev \ + # yaml-dev \ + pcre2-dev \ + zlib-dev \ + zstd-dev \ +# https://github.com/xdebug/xdebug/pull/835 + linux-headers + +ENV PECL_RUN_DEPS \ + libmemcached-libs \ + # yaml \ + zlib \ + zstd-libs + +ENV PECL_EXTENSION \ + # mongodb \ + # https://github.com/mongodb/mongo-php-driver/archive/master.tar.gz \ + # igbinary \ + https://github.com/igbinary/igbinary/archive/master.tar.gz \ + # redis \ + https://github.com/phpredis/phpredis/archive/develop.tar.gz \ + memcached \ + # xdebug-beta \ + # yaml \ + # https://github.com/php/pecl-file_formats-yaml/archive/php7.tar.gz \ + https://github.com/kjdev/php-ext-zstd/archive/0.11.0.tar.gz \ + ${PECL_EXTENSION_EXTRA:-} + +RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \ + set -x \ + && cp -a /opt/bin/docker-php-entrypoint /usr/local/bin \ + && export PATH=$PATH:/opt/bin \ + && apk add --no-cache --virtual .pecl_build_deps $PECL_BUILD_DEPS $PHPIZE_DEPS \ + && apk add --no-cache --virtual .pecl_run_deps $PECL_RUN_DEPS \ + && curl -fsSL -o /usr/local/bin/pickle \ + https://github.com/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar \ + && chmod +x /usr/local/bin/pickle \ + && echo "--enable-redis-igbinary --enable-redis-zstd" > /tmp/redis.configure.options \ + && echo "--enable-memcached-igbinary" > /tmp/memcached.configure.options \ + && echo "--with-libzstd" > /tmp/zstd.configure.options \ + && pickle install $PECL_EXTENSION -n --defaults --strip --cleanup \ + && pickle install \ + # xdebug \ + https://github.com/xdebug/xdebug/archive/master.tar.gz \ +# https://github.com/tideways/php-xhprof-extension.git + https://github.com/tideways/php-xhprof-extension/archive/master.tar.gz \ + -n --defaults --no-write --strip --cleanup \ + && apk del --no-network .pecl_build_deps \ + && rm -rf /tmp/* \ + && php -m \ + && ls -la $(php-config --extension-dir) \ + && php -d error_reporting=22527 -d display_errors=1 -r 'var_dump(iconv("UTF-8", "UTF-8//IGNORE", "This is the Euro symbol '\''€'\''."));' \ +# smoke test + && php --version + +WORKDIR /app + +ENTRYPOINT ["docker-php-entrypoint"] + +CMD ["php", "-a"] + +ARG VCS_REF="unknow" + +LABEL org.opencontainers.image.revision=$VCS_REF \ + org.opencontainers.image.source="https://github.com/khs1994-docker/php" diff --git a/dockerfile/php/8.3/composer/Dockerfile b/dockerfile/php/8.3/composer/Dockerfile new file mode 100644 index 000000000..6330fdd5d --- /dev/null +++ b/dockerfile/php/8.3/composer/Dockerfile @@ -0,0 +1,63 @@ +# syntax=docker/dockerfile:labs +ARG PHP_VERSION=8.3.0beta1 +ARG USERNAME=khs1994 +# ARG BASE=fpm +ARG BASE=cli + +FROM --platform=$TARGETPLATFORM ${USERNAME}/php:${PHP_VERSION}-${BASE}-alpine + +# install composer + +ENV COMPOSER_DEP_APKS \ + git \ + # 以下两个均为版本控制系统 + # subversion \ + # mercurial \ + openssh-client \ + tini + +ENV COMPOSER_ALLOW_SUPERUSER=1 \ + COMPOSER_HOME=/tmp/composer \ + COMPOSER_NO_INTERACTION=1 \ + COMPOSER_VERSION=2.5.8 \ + PS1="[\u@\h \w]# " + +# https://github.com/composer/docker + +RUN --mount=type=bind,from=composer:2.5.8,source=/usr/bin/composer,target=/opt/bin/composer \ + set -x \ + && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ + && { echo "memory_limit=-1"; \ + echo "date.timezone=${PHP_TIMEZONE:-PRC}"; \ + } | tee ${PHP_INI_DIR}/php-cli.ini \ + # && curl -s -f -L -o /tmp/installer.php https://raw.githubusercontent.com/composer/getcomposer.org/cb19f2aa3aeaa2006c0cd69a7ef011eb31463067/web/installer \ + # && php -r " \ + # \$signature = '48e3236262b34d30969dca3c37281b3b4bbe3221bda826ac6a9a62d6444cdb0dcd0615698a5cbe587c3f0fe57a54d8f5'; \ + # \$hash = hash('sha384', file_get_contents('/tmp/installer.php')); \ + # if (!hash_equals(\$signature, \$hash)) { \ + # unlink('/tmp/installer.php'); \ + # echo 'Integrity check failed, installer is either corrupt or worse.' . PHP_EOL; \ + # exit(1); \ + # }" \ + # && php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \ + && curl -fsSL https://raw.githubusercontent.com/composer/docker/493d91e44e4d5245e80ff9462f2653c7d7de9a8c/2.4/docker-entrypoint.sh \ + -o /docker-entrypoint.composer \ + && chmod +x /docker-entrypoint.composer \ + && cp -a /opt/bin/composer /usr/bin/composer \ + && composer --ansi --version --no-interaction \ + && echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ + && apk add --no-cache gosu \ + \ +# laravel 安装程序 +# && composer global require --prefer-dist --ignore-platform-reqs "laravel/installer" \ +# composer 中国镜像 + && composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/ + +ENTRYPOINT ["/docker-entrypoint.composer"] + +CMD ["composer"] + +ARG VCS_REF="unknow" + +LABEL org.opencontainers.image.revision=$VCS_REF \ + org.opencontainers.image.source="https://github.com/khs1994-docker/php" diff --git a/dockerfile/php/8.3/fpm/Dockerfile b/dockerfile/php/8.3/fpm/Dockerfile new file mode 100644 index 000000000..6322a8f8d --- /dev/null +++ b/dockerfile/php/8.3/fpm/Dockerfile @@ -0,0 +1,189 @@ +# syntax=docker/dockerfile:labs +ARG PHP_VERSION=8.3.0beta1 + +FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.18 as php + +LABEL maintainer="khs1994-docker/lnmp " + +ARG PHP_EXTENSION_EXTRA + +ARG PECL_EXTENSION_EXTRA + +ARG APK_EXTRA + +ARG APK_DEV_EXTRA + +ENV TZ=Asia/Shanghai \ + APP_ENV=development + +ENV PHP_EXTENSION \ + bcmath \ + bz2 \ + calendar \ + enchant \ + exif \ + gd \ + gettext \ + gmp \ + imap \ + intl \ + mysqli \ + pcntl \ + pdo_pgsql \ + pdo_mysql \ + pgsql \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + # tidy \ + # xsl \ + zip \ + shmop \ + ffi \ + ${PHP_EXTENSION_EXTRA:-} + +ENV PECL_EXTENSION \ + # mongodb \ + # https://github.com/mongodb/mongo-php-driver/archive/master.tar.gz \ + # igbinary \ + https://github.com/igbinary/igbinary/archive/master.tar.gz \ + # redis \ + https://github.com/phpredis/phpredis/archive/develop.tar.gz \ + memcached \ +# 安装测试版的扩展，可以在扩展名后加 -beta + # xdebug-beta \ + # yaml \ + # https://github.com/php/pecl-file_formats-yaml/archive/php7.tar.gz \ + https://github.com/kjdev/php-ext-zstd/archive/0.11.0.tar.gz \ + ${PECL_EXTENSION_EXTRA:-} + +ARG ALPINE_URL=dl-cdn.alpinelinux.org + +RUN sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ + && set -xe \ + \ + # && apk add --no-cache patch \ + # && cd / \ + # && { \ + # echo "--- a/usr/local/lib/php/build/php.m4"; \ + # } | tee 1.diff \ + # && patch -p1 < 1.diff \ + # && apk del --no-network patch \ + # && rm -rf 1.diff \ + \ +# 不要删除 + && PHP_FPM_RUN_DEPS=" \ + bash \ + tzdata \ + libmemcached-libs \ + libpq \ + libzip \ + zlib \ + libpng \ + freetype \ + libjpeg-turbo \ + libxpm \ + libwebp \ + libbz2 \ + libexif \ + gmp \ + enchant2 \ + c-client \ + icu-libs \ + zstd-libs \ +# https://github.com/xdebug/xdebug/pull/835 + linux-headers \ + libavif \ + ${APK_EXTRA:-} \ + " \ + # tidyhtml-libs \ + # libxslt \ + # yaml \ +# *-dev 编译之后删除 + && PHP_FPM_BUILD_DEPS=" \ + openssl-dev \ + libmemcached-dev \ + cyrus-sasl-dev \ + postgresql-dev \ + libzip-dev \ + zlib-dev \ + libpng-dev \ + freetype-dev \ + libjpeg-turbo-dev \ + libxpm-dev \ + libwebp-dev \ + libexif-dev \ + gmp-dev \ + bzip2-dev \ + enchant2-dev \ + imap-dev \ + gettext-dev \ + libwebp-dev \ + icu-dev \ + zstd-dev \ + libavif-dev \ + ${APK_DEV_EXTRA:-} \ + " \ + # tidyhtml-dev \ + # libxslt-dev \ + # yaml-dev \ + && apk add --no-cache --virtual .php-fpm-run-deps $PHP_FPM_RUN_DEPS \ + && apk add --no-cache --virtual .php-fpm-build-deps $PHP_FPM_BUILD_DEPS \ + && apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS \ + && curl -fsSL -o /usr/local/bin/pickle \ + https://github.com/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar \ + && chmod +x /usr/local/bin/pickle \ +# 安装内置扩展 + && docker-php-source extract \ + && docker-php-ext-configure zip \ + --with-zip \ + && docker-php-ext-install zip \ + && strip --strip-all $(php-config --extension-dir)/zip.so \ + # && docker-php-ext-configure gd \ + && echo " \ + --disable-gd-jis-conv \ + --with-freetype \ + --with-jpeg \ + --with-webp \ + --with-xpm \ + --with-avif" > /tmp/gd.configure.options \ + # && docker-php-ext-install $PHP_EXTENSION \ + && pickle install $PHP_EXTENSION -n --defaults --strip \ + && docker-php-source delete \ +# 安装 PECL 扩展 + && echo "--enable-redis-igbinary --enable-redis-zstd" > /tmp/redis.configure.options \ + && echo "--enable-memcached-igbinary" > /tmp/memcached.configure.options \ + && echo "--with-libzstd" > /tmp/zstd.configure.options \ + && pickle install $PECL_EXTENSION -n --defaults \ + --strip --cleanup \ +# 默认不启用的扩展 + && pickle install \ + # xdebug \ + https://github.com/xdebug/xdebug/archive/master.tar.gz \ +# https://github.com/tideways/php-xhprof-extension.git + https://github.com/tideways/php-xhprof-extension/archive/master.tar.gz \ + -n --defaults --strip --cleanup --no-write \ + && pickle install opcache \ + # && docker-php-ext-enable opcache \ + && apk del --no-network .phpize-deps .php-fpm-build-deps \ + && rm -rf /tmp/* \ +# 创建日志文件夹 + && mkdir -p /var/log/php-fpm \ + && ln -sf /dev/stdout /var/log/php-fpm/access.log \ + && ln -sf /dev/stderr /var/log/php-fpm/error.log \ + && ln -sf /dev/stderr /var/log/php-fpm/xdebug-remote.log \ + && chmod -R 777 /var/log/php-fpm \ + && rm -rf /usr/local/lib/php/.registry/.channel.pecl.php.net/* \ + && php -m \ + && ls -la $(php-config --extension-dir) \ + && php -d error_reporting=22527 -d display_errors=1 -r 'var_dump(iconv("UTF-8", "UTF-8//IGNORE", "This is the Euro symbol '\''€'\''."));' \ +# smoke test + && php --version + +WORKDIR /app + +ARG VCS_REF="unknow" + +LABEL org.opencontainers.image.revision=$VCS_REF \ + org.opencontainers.image.source="https://github.com/khs1994-docker/php" diff --git a/dockerfile/php/8.3/fpm/docker-compose.test.yml b/dockerfile/php/8.3/fpm/docker-compose.test.yml new file mode 100644 index 000000000..ee92aaaf9 --- /dev/null +++ b/dockerfile/php/8.3/fpm/docker-compose.test.yml @@ -0,0 +1,3 @@ +sut: + build: . + command: php -v diff --git a/dockerfile/php/8.3/s6/Dockerfile b/dockerfile/php/8.3/s6/Dockerfile new file mode 100644 index 000000000..abec2f60d --- /dev/null +++ b/dockerfile/php/8.3/s6/Dockerfile @@ -0,0 +1,42 @@ +# syntax=docker/dockerfile:labs + +ARG PHP_VERSION=8.3.0beta1 +ARG USERNAME=khs1994 +ARG BASE=fpm + +FROM --platform=$TARGETPLATFORM ${USERNAME}/php:${PHP_VERSION}-${BASE}-alpine + +RUN --mount=type=bind,from=khs1994/s6:3.1.4.2,source=/,target=/tmp/s6 \ + --network=none \ + set -x \ + && tar -xvf /tmp/s6/s6-overlay-noarch.tar.xz -C / \ + && tar -xvf /tmp/s6/s6-overlay.tar.xz -C / \ +# https://github.com/MinchinWeb/docker-base/commit/f5e350dcf3523a424772a1e42a3dba3200d7a2aa + && ln -s /init /s6-init \ + && ln -s /command/elgetopt /usr/local/bin/ + +VOLUME [ "/etc/services.d"] + +ENV S6_KEEP_ENV=0 \ + S6_LOGGING=0 \ + S6_BEHAVIOUR_IF_STAGE2_FAILS=0 \ + S6_KILL_FINISH_MAXTIME=5000 \ + S6_SERVICES_GRACETIME=3000 \ + S6_KILL_GRACETIME=3000 \ + S6_LOGGING_SCRIPT="n20 s1000000 T" \ + S6_CMD_ARG0= \ + S6_FIX_ATTRS_HIDDEN=0 \ + S6_CMD_WAIT_FOR_SERVICES=0 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000 \ + S6_READ_ONLY_ROOT=0 \ + S6_SYNC_DISKS=0 \ + PATH=/command:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + +ENTRYPOINT ["/s6-init"] + +# ENTRYPOINT ["/command/s6-svscan", "-t0", "/etc/services.d"] + +ARG VCS_REF="unknow" + +LABEL org.opencontainers.image.revision=$VCS_REF \ + org.opencontainers.image.source="https://github.com/khs1994-docker/php" diff --git a/dockerfile/php/8.3/swoole/Dockerfile b/dockerfile/php/8.3/swoole/Dockerfile new file mode 100644 index 000000000..2877767e9 --- /dev/null +++ b/dockerfile/php/8.3/swoole/Dockerfile @@ -0,0 +1,57 @@ +# syntax=docker/dockerfile:labs +ARG PHP_VERSION=8.3.0beta1 +ARG USERNAME=khs1994 +ARG BASE=cli + +FROM --platform=$TARGETPLATFORM ${USERNAME}/php:${PHP_VERSION}-${BASE}-alpine + +LABEL maintainer="khs1994-docker/lnmp " + +ARG PHP_EXTENSION_EXTRA + +ARG PECL_EXTENSION_EXTRA + +ARG APK_EXTRA + +ARG APK_DEV_EXTRA + +ENV TZ=Asia/Shanghai \ + APP_ENV=development + +ENV PECL_EXTENSION \ + swoole \ + ${PECL_EXTENSION_EXTRA:-} + +# ENV SWOOLE_VERSION=v5.0.3 +ENV SWOOLE_VERSION=master + +ARG ALPINE_URL=dl-cdn.alpinelinux.org + +RUN --mount=type=bind,from=php:8.3.0beta1-alpine,source=/usr/local/bin,target=/opt/bin,rw \ + set -x \ + && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ + && apk add --no-cache --virtual .pecl_build_deps \ + $PHPIZE_DEPS \ + openssl-dev \ + pcre2-dev \ + && export PATH=$PATH:/opt/bin \ + && echo " \ + --enable-openssl \ + " > /tmp/swoole.configure.options \ + && pickle install https://github.com/swoole/swoole-src/archive/${SWOOLE_VERSION}.tar.gz \ + -n --defaults --strip --cleanup \ + && apk del --no-network .pecl_build_deps \ + && rm -rf /tmp/* \ + && rm -rf /usr/local/lib/php/.registry/.channel.pecl.php.net/* \ +# smoke test + && php --version + +WORKDIR /app + +ENTRYPOINT ["php"] +CMD ["index.php"] + +ARG VCS_REF="unknow" + +LABEL org.opencontainers.image.revision=$VCS_REF \ + org.opencontainers.image.source="https://github.com/khs1994-docker/php" diff --git a/dockerfile/php/8.3/unit/Dockerfile b/dockerfile/php/8.3/unit/Dockerfile new file mode 100644 index 000000000..599faaf1d --- /dev/null +++ b/dockerfile/php/8.3/unit/Dockerfile @@ -0,0 +1,63 @@ +# syntax=docker/dockerfile:labs +ARG PHP_VERSION=8.3.0beta1 +ARG USERNAME=khs1994 +ARG BASE=cli + +FROM --platform=$TARGETPLATFORM ${USERNAME}/php:${PHP_VERSION}-${BASE}-alpine + +LABEL maintainer="khs1994-docker/lnmp " + +# ENV NGINX_UNIT_VERSION=1.30.0 +ENV NGINX_UNIT_VERSION=master + +RUN set -x \ + && mkdir -p /usr/src/unit \ + && cd /usr/src/unit \ + && curl -fsSL https://github.com/nginx/unit/archive/${NGINX_UNIT_VERSION}.tar.gz \ + | tar --strip=1 -zxvf - \ + && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ + openssl-dev \ + linux-headers \ + pcre2-dev \ + patch \ + \ + # && curl -L https://patch-diff.githubusercontent.com/raw/nginx/unit/pull/713.diff -O \ + # && patch -p1 < 713.diff \ + \ + && ./configure --prefix=/usr/local/nginx-unit --openssl \ + && ./configure php \ + --module=php80 \ + --lib-path=/usr/local/lib \ + --config=/usr/local/bin/php-config \ + && make -j "$(nproc)" \ + && make install \ + && strip --strip-all /usr/local/nginx-unit/sbin/unitd \ + && mkdir -p /usr/local/sbin \ + && ln -sf /usr/local/nginx-unit/sbin/unitd /usr/local/sbin/unitd \ + && ln -sf /usr/local/nginx-unit/sbin/unitd /usr/sbin/unitd \ + && apk add --no-cache findutils \ + && apk del --no-network .build-deps \ + && rm -rf /usr/src/* \ + && mkdir -p /var/log/nginx-unit /usr/local/nginx-unit/tmp \ + && ln -sf /dev/stdout /var/log/nginx-unit/nginx-unit.log \ + && mkdir /docker-entrypoint.d/ + +COPY docker-entrypoint.sh / + +ENV PS1="[\u@\h \w]# " + +VOLUME [ "/usr/local/nginx-unit/tmp", "/usr/local/nginx-unit/state" ] + +STOPSIGNAL SIGTERM + +ENTRYPOINT ["bash", "/docker-entrypoint.sh"] + +CMD ["unitd","--no-daemon","--user","root","--group","root","--log","/var/log/nginx-unit/nginx-unit.log","--control","unix:/usr/local/nginx-unit/control.unit.sock"] + +WORKDIR /app + +ARG VCS_REF="unknow" + +LABEL org.opencontainers.image.revision=$VCS_REF \ + org.opencontainers.image.source="https://github.com/khs1994-docker/php" diff --git a/dockerfile/php/8.3/unit/docker-entrypoint.sh b/dockerfile/php/8.3/unit/docker-entrypoint.sh new file mode 100644 index 000000000..330617ca7 --- /dev/null +++ b/dockerfile/php/8.3/unit/docker-entrypoint.sh @@ -0,0 +1,93 @@ +#!/usr/bin/env bash + +# copy from https://github.com/nginx/unit/blob/master/pkg/docker/docker-entrypoint.sh + +# /var/lib/unit => /usr/local/nginx-unit/state +# /var/run/control.unit.sock => /usr/local/nginx-unit/control.unit.sock +# /var/run/unit.pid => /usr/local/nginx-unit/unit.pid + +echo "==> Initial Configuration, please see https://unit.nginx.org/installation/#initial-configuration" + +set -e + +WAITLOOPS=5 +SLEEPSEC=1 + +curl_put() +{ + RET=$(/usr/bin/curl -s -w '%{http_code}' -X PUT --data-binary @$1 --unix-socket /usr/local/nginx-unit/control.unit.sock http://localhost/$2) + RET_BODY=$(echo $RET | /bin/sed '$ s/...$//') + RET_STATUS=$(echo $RET | /usr/bin/tail -c 4) + if [ "$RET_STATUS" -ne "200" ]; then + echo "$0: Error: HTTP response status code is '$RET_STATUS'" + echo "$RET_BODY" + return 1 + else + echo "$0: OK: HTTP response status code is '$RET_STATUS'" + echo "$RET_BODY" + fi + return 0 +} + +if [ "$1" = "unitd" ] || [ "$1" = "unitd-debug" ]; then + if /usr/bin/find "/usr/local/nginx-unit/state/" -mindepth 1 -print -quit 2>/dev/null | /bin/grep -q .; then + echo "$0: /usr/local/nginx-unit/state/ is not empty, skipping initial configuration..." + else + if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -print -quit 2>/dev/null | /bin/grep -q .; then + echo "$0: /docker-entrypoint.d/ is not empty, launching Unit daemon to perform initial configuration..." + /usr/sbin/$1 --control unix:/usr/local/nginx-unit/control.unit.sock + + while [ ! -S /usr/local/nginx-unit/control.unit.sock ]; do echo "$0: Waiting for control socket to be created..."; /bin/sleep 0.1; done + # even when the control socket exists, it does not mean unit has finished initialisation + # this curl call will get a reply once unit is fully launched + /usr/bin/curl -s -X GET --unix-socket /usr/local/nginx-unit/control.unit.sock http://localhost/ + + echo "$0: Looking for certificate bundles in /docker-entrypoint.d/..." + for f in $(/usr/bin/find /docker-entrypoint.d/ -type f -name "*.pem"); do + echo "$0: Uploading certificates bundle: $f" + curl_put $f "certificates/$(basename $f .pem)" + done + + echo "$0: Looking for configuration snippets in /docker-entrypoint.d/..." + for f in $(/usr/bin/find /docker-entrypoint.d/ -type f -name "*.json"); do + echo "$0: Applying configuration $f"; + curl_put $f "config" + done + + echo "$0: Looking for shell scripts in /docker-entrypoint.d/..." + for f in $(/usr/bin/find /docker-entrypoint.d/ -type f -name "*.sh"); do + echo "$0: Launching $f"; + "$f" + done + + # warn on filetypes we don't know what to do with + for f in $(/usr/bin/find /docker-entrypoint.d/ -type f -not -name "*.sh" -not -name "*.json" -not -name "*.pem"); do + echo "$0: Ignoring $f"; + done + + echo "$0: Stopping Unit daemon after initial configuration..." + kill -TERM $(/bin/cat /usr/local/nginx-unit/unit.pid) + + for i in $(/usr/bin/seq $WAITLOOPS); do + if [ -S /usr/local/nginx-unit/control.unit.sock ]; then + echo "$0 Waiting for control socket to be removed..." + /bin/sleep $SLEEPSEC + else + break + fi + done + if [ -S /usr/local/nginx-unit/control.unit.sock ]; then + kill -KILL $(/bin/cat /usr/local/nginx-unit/unit.pid) + rm -f /usr/local/nginx-unit/control.unit.sock + fi + + echo + echo "$0: Unit initial configuration complete; ready for start up..." + echo + else + echo "$0: /docker-entrypoint.d/ is empty, skipping initial configuration..." + fi + fi +fi + +exec "$@" diff --git a/dockerfile/php/README.md b/dockerfile/php/README.md index 6fd609907..af899165b 100644 --- a/dockerfile/php/README.md +++ b/dockerfile/php/README.md @@ -14,28 +14,28 @@ ## 后缀 -* 8.2.4-cli-alpine -* 8.2.4-fpm-alpine -* 8.2.4-unit-alpine (based cli) -* 8.2.4-composer-alpine (based fpm) -* 8.2.4-swoole-alpine (based cli) -* 8.2.4-s6-alpine (based fpm) +* 8.2.5-cli-alpine +* 8.2.5-fpm-alpine +* 8.2.5-unit-alpine (based cli) +* 8.2.5-composer-alpine (based fpm) +* 8.2.5-swoole-alpine (based cli) +* 8.2.5-s6-alpine (based fpm) ## Supported tags and respective `Dockerfile` links -* [`8.2.4-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/8.2/fpm/Dockerfile) +* [`8.2.5-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/8.2/fpm/Dockerfile) -* [`8.1.13-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/8.1/fpm/Dockerfile) +* [`8.1.15-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/8.1/fpm/Dockerfile) -* [`8.0.27-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/8.0/fpm/Dockerfile) +* [`8.0.28-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/8.0/fpm/Dockerfile) * [`nightly-fpm-alpine` (nightly/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/master/nightly/fpm/Dockerfile) -* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/7.4/fpm/Dockerfile) +* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/7.4/fpm/Dockerfile) -* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/7.3/fpm/Dockerfile) +* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/7.3/fpm/Dockerfile) -* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.4/7.2/fpm/Dockerfile) +* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/7.2/fpm/Dockerfile) ## Overview @@ -168,7 +168,7 @@ $ for ext in `ls /usr/src/php/ext`; do echo '*' $( php -r "if(extension_loaded(' * https://sources.debian.org/src/php7.4/7.4.33-1+deb11u1/debian/control/ -* https://sources.debian.org/src/php8.1/8.2.4-1/debian/control/ +* https://sources.debian.org/src/php8.1/8.2.5-1/debian/control/ * https://ram.tianon.xyz/post/2017/12/26/dockerize-compiled-software.html diff --git a/dockerfile/php/doctum/Dockerfile b/dockerfile/php/doctum/Dockerfile index 3fdd0a29c..8e0b93ee5 100644 --- a/dockerfile/php/doctum/Dockerfile +++ b/dockerfile/php/doctum/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.27 +ARG PHP_VERSION=8.0.28 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/nightly/composer/Dockerfile b/dockerfile/php/nightly/composer/Dockerfile index af254e871..47c1f3055 100644 --- a/dockerfile/php/nightly/composer/Dockerfile +++ b/dockerfile/php/nightly/composer/Dockerfile @@ -24,12 +24,12 @@ ENV COMPOSER_DEP_APKS \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ COMPOSER_NO_INTERACTION=1 \ - COMPOSER_VERSION=2.5.5 \ + COMPOSER_VERSION=2.5.8 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.5.5,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.5.8,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ diff --git a/dockerfile/php/nightly/swoole/Dockerfile b/dockerfile/php/nightly/swoole/Dockerfile index c0318b1e5..a2a94b1e2 100644 --- a/dockerfile/php/nightly/swoole/Dockerfile +++ b/dockerfile/php/nightly/swoole/Dockerfile @@ -25,7 +25,7 @@ ENV PECL_EXTENSION \ swoole \ ${PECL_EXTENSION_EXTRA:-} -# ENV SWOOLE_VERSION=v5.0.0 +# ENV SWOOLE_VERSION=v5.0.3 ENV SWOOLE_VERSION=master RUN --mount=type=bind,from=php:alpine,source=/usr/local/bin,target=/opt/bin,rw \ diff --git a/dockerfile/php/php-cs-fixer/Dockerfile b/dockerfile/php/php-cs-fixer/Dockerfile index 0646686ea..3960cce44 100644 --- a/dockerfile/php/php-cs-fixer/Dockerfile +++ b/dockerfile/php/php-cs-fixer/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.13 +ARG PHP_VERSION=8.1.15 ARG USERNAME=khs1994 ARG BASE=composer @@ -8,7 +8,7 @@ FROM alpine as downloader # php-cs-fixer https://github.com/FriendsOfPHP/PHP-CS-Fixer -ARG PHP_CS_FIXER_VERSION=3.7.0 +ARG PHP_CS_FIXER_VERSION=3.22.0 RUN set -x ; apk add --no-cache curl \ && curl -fsSL https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${PHP_CS_FIXER_VERSION}/php-cs-fixer.phar \ diff --git a/dockerfile/php/phpmd/Dockerfile b/dockerfile/php/phpmd/Dockerfile index 80cbfe615..382f110ed 100644 --- a/dockerfile/php/phpmd/Dockerfile +++ b/dockerfile/php/phpmd/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.27 +ARG PHP_VERSION=8.0.28 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/sync/docker-image-sync.json b/dockerfile/php/sync/docker-image-sync.json index 47f588e64..34614312f 100644 --- a/dockerfile/php/sync/docker-image-sync.json +++ b/dockerfile/php/sync/docker-image-sync.json @@ -1,57 +1,57 @@ [ { - "source": "php:8.2.4-cli-alpine" + "source": "php:8.2.5-cli-alpine" }, { - "source": "php:8.2.4-fpm-alpine" + "source": "php:8.2.5-fpm-alpine" }, { - "source": "php:8.2.4-unit-alpine" + "source": "php:8.2.5-unit-alpine" }, { - "source": "php:8.2.4-composer-alpine" + "source": "php:8.2.5-composer-alpine" }, { - "source": "php:8.2.4-swoole-alpine" + "source": "php:8.2.5-swoole-alpine" }, { - "source": "php:8.2.4-s6-alpine" + "source": "php:8.2.5-s6-alpine" }, { - "source": "php:8.1.13-cli-alpine" + "source": "php:8.1.15-cli-alpine" }, { - "source": "php:8.1.13-fpm-alpine" + "source": "php:8.1.15-fpm-alpine" }, { - "source": "php:8.1.13-unit-alpine" + "source": "php:8.1.15-unit-alpine" }, { - "source": "php:8.1.13-composer-alpine" + "source": "php:8.1.15-composer-alpine" }, { - "source": "php:8.1.13-swoole-alpine" + "source": "php:8.1.15-swoole-alpine" }, { - "source": "php:8.1.13-s6-alpine" + "source": "php:8.1.15-s6-alpine" }, { - "source": "php:8.0.27-cli-alpine" + "source": "php:8.0.28-cli-alpine" }, { - "source": "php:8.0.27-fpm-alpine" + "source": "php:8.0.28-fpm-alpine" }, { - "source": "php:8.0.27-unit-alpine" + "source": "php:8.0.28-unit-alpine" }, { - "source": "php:8.0.27-composer-alpine" + "source": "php:8.0.28-composer-alpine" }, { - "source": "php:8.0.27-swoole-alpine" + "source": "php:8.0.28-swoole-alpine" }, { - "source": "php:8.0.27-s6-alpine" + "source": "php:8.0.28-s6-alpine" }, { "source": "php:nightly-cli-alpine" diff --git a/dockerfile/php/sync/manifest.txt b/dockerfile/php/sync/manifest.txt index ae2a51135..ef7e87647 100644 --- a/dockerfile/php/sync/manifest.txt +++ b/dockerfile/php/sync/manifest.txt @@ -1,21 +1,21 @@ -8.2.4-cli-alpine -8.2.4-fpm-alpine -8.2.4-unit-alpine -8.2.4-composer-alpine -8.2.4-swoole-alpine -8.2.4-s6-alpine -8.1.13-cli-alpine -8.1.13-fpm-alpine -8.1.13-unit-alpine -8.1.13-composer-alpine -8.1.13-swoole-alpine -8.1.13-s6-alpine -8.0.27-cli-alpine -8.0.27-fpm-alpine -8.0.27-unit-alpine -8.0.27-composer-alpine -8.0.27-swoole-alpine -8.0.27-s6-alpine +8.2.5-cli-alpine +8.2.5-fpm-alpine +8.2.5-unit-alpine +8.2.5-composer-alpine +8.2.5-swoole-alpine +8.2.5-s6-alpine +8.1.15-cli-alpine +8.1.15-fpm-alpine +8.1.15-unit-alpine +8.1.15-composer-alpine +8.1.15-swoole-alpine +8.1.15-s6-alpine +8.0.28-cli-alpine +8.0.28-fpm-alpine +8.0.28-unit-alpine +8.0.28-composer-alpine +8.0.28-swoole-alpine +8.0.28-s6-alpine 7.4.33-cli-alpine 7.4.33-fpm-alpine 7.4.33-unit-alpine diff --git a/dockerfile/php/tests/git/Dockerfile b/dockerfile/php/tests/git/Dockerfile index 0e1446c7e..b0b411600 100644 --- a/dockerfile/php/tests/git/Dockerfile +++ b/dockerfile/php/tests/git/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.18 RUN apk add --no-cache git \ openssh-client \ diff --git a/dockerfile/sync/docker-image-sync-by-docker.json b/dockerfile/sync/docker-image-sync-by-docker.json index f8d7e4e95..e0b52b985 100644 --- a/dockerfile/sync/docker-image-sync-by-docker.json +++ b/dockerfile/sync/docker-image-sync-by-docker.json @@ -92,8 +92,8 @@ "dest": "nginx-ingress-kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794@sha256:01d181618f270f2a96c04006f33b2699ad3ccb02da48d0f89b22abce084b292f" }, { - "source": "registry.k8s.io/metrics-server/metrics-server:v0.6.0", - "dest": "gcr-mirror/metrics-server:v0.6.0" + "source": "registry.k8s.io/metrics-server/metrics-server:v0.6.3", + "dest": "gcr-mirror/metrics-server:v0.6.3" }, { "source": "gcr.io/k8s-staging-metrics-server/metrics-server:master", diff --git a/docs/custom.md b/docs/custom.md index a4a011006..d2f73fe7b 100644 --- a/docs/custom.md +++ b/docs/custom.md @@ -37,7 +37,7 @@ services: php8: # 想修改哪个配置在这里重写即可，例如想使用自己的 PHP 镜像或国内镜像，那么增加 `image` 指令即可 - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.4}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.5}-fpm-alpine ``` 你也可以加上 `build` 字段，先构建镜像再启动 @@ -48,7 +48,7 @@ services: services: php8: - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.4}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.5}-fpm-alpine # 增加 build 字段 build: context: ./dockerfile/php/ diff --git a/kubernetes/lnmp/php/base/lnmp-php.yaml b/kubernetes/lnmp/php/base/lnmp-php.yaml index 4ae995d4b..e82794503 100644 --- a/kubernetes/lnmp/php/base/lnmp-php.yaml +++ b/kubernetes/lnmp/php/base/lnmp-php.yaml @@ -44,7 +44,7 @@ spec: kubernetes.io/os: linux containers: - name: lnmp-php - image: khs1994/php:8.2.4-fpm-alpine + image: khs1994/php:8.2.5-fpm-alpine imagePullPolicy: IfNotPresent args: - php-fpm diff --git a/lrew/nginx-unit/docker-compose.yml b/lrew/nginx-unit/docker-compose.yml index 1f91257dc..72b8482a5 100644 --- a/lrew/nginx-unit/docker-compose.yml +++ b/lrew/nginx-unit/docker-compose.yml @@ -20,7 +20,7 @@ services: << : - *common - *common-label - image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.4}-unit-alpine" + image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.5}-unit-alpine" volumes: - ./config/${LNMP_NGINX_UNIT_CONF:-nginx-unit}:/etc/nginx-unit # ./path/unit-init-conf:/docker-entrypoint.d diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index 12c08e0f6..a766c0eec 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -14,10 +14,10 @@ services: image: memcached:1.6.15-alpine php: - image: php:8.2.4-fpm-alpine + image: php:8.2.5-fpm-alpine composer: - image: composer:2.5.5 + image: composer:2.5.8 nginx: image: nginx:1.23.3-alpine diff --git a/vscode-remote/docker-workspace.yml b/vscode-remote/docker-workspace.yml index 13beeebfd..7fdf6781c 100644 --- a/vscode-remote/docker-workspace.yml +++ b/vscode-remote/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.4-composer-alpine + image: khs1994/php:8.2.5-composer-alpine networks: - backend volumes: @@ -68,7 +68,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.4-composer-alpine" + image: "khs1994/php:8.2.5-composer-alpine" command: [] # install | update npm: diff --git a/windows/lnmp-windows-pm-repo/composer/lwpm.json b/windows/lnmp-windows-pm-repo/composer/lwpm.json index 567fcd45a..b8cb66b60 100644 --- a/windows/lnmp-windows-pm-repo/composer/lwpm.json +++ b/windows/lnmp-windows-pm-repo/composer/lwpm.json @@ -1,8 +1,8 @@ { "name": "composer", "description": "Dependency Manager for PHP", - "version": "2.5.5", - "pre-version": "2.5.5", + "version": "2.5.8", + "pre-version": "2.5.8", "homepage": "https://getcomposer.org/", "bug": "https://github.com/composer/composer/issues", "github": "composer/composer", diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.json b/windows/lnmp-windows-pm-repo/php/lwpm.json index bc70c5f16..5e1d7fdc3 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php/lwpm.json @@ -10,7 +10,7 @@ "C:\\php", "C:\\php-pre" ], - "pre-version": "8.2.4", + "pre-version": "8.2.5", "releases": "https://www.php.net/downloads.php", "scripts": { "get-version": "if(!($VERSION)){\n$VERSION=$stable_version\n}\nif($isPre){\n$VC_VERSION=\"nts-Win32-vs16\"\n$VERSION=$pre_version\n$url=\"https://windows.php.net/downloads/qa/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/qa/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php-pre\"\n$global:PHP_PREFIX=\"C:\\php-pre\"\n}else{\n$VC_VERSION=\"nts-Win32-vs16\"\n$url=\"https://windows.php.net/downloads/releases/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/releases/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php\"\n$global:PHP_PREFIX=\"C:\\php\"\n}", @@ -32,5 +32,5 @@ "uninstall": "if($isPre -eq 1){_cleanup \"C:\\php-pre\"}else{_cleanup \"C:\\php\"}\n", "version": "(php -v).split(\" \")[1]" }, - "version": "8.2.4" + "version": "8.2.5" } diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.yaml b/windows/lnmp-windows-pm-repo/php/lwpm.yaml index 701d0fa78..bbb39f000 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php/lwpm.yaml @@ -1,7 +1,7 @@ name: "php" description: "PHP is a popular general-purpose scripting language that is especially suited to web development" -version: "8.2.4" -pre-version: "8.2.4" +version: "8.2.5" +pre-version: "8.2.5" homepage: "https://www.php.net/" bug: "https://www.php.net/" github: "php/php-src" diff --git a/wsl/.env b/wsl/.env index 483e47c34..801b4d1fa 100644 --- a/wsl/.env +++ b/wsl/.env @@ -2,8 +2,8 @@ PHP_VERSION_71=7.1.33 PHP_VERSION_72=7.2.34 PHP_VERSION_73=7.3.33 PHP_VERSION_74=7.4.33 -PHP_VERSION_80=8.0.27 -PHP_VERSION_81=8.1.13 -PHP_VERSION_82=8.2.4 +PHP_VERSION_80=8.0.28 +PHP_VERSION_81=8.1.15 +PHP_VERSION_82=8.2.5 registry=docker.io diff --git a/wsl/Dockerfile b/wsl/Dockerfile index 24bb0f0f2..27205f0c1 100755 --- a/wsl/Dockerfile +++ b/wsl/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim ################################################################################ -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 ARG PHP_NUM=82 @@ -10,7 +10,7 @@ ARG PHP_PREFIX=/usr/local/php82 ARG PHP_INI_DIR=/usr/local/etc/php82 -ARG COMPOSER_VERSION=2.5.5 +ARG COMPOSER_VERSION=2.5.8 ENV COMPOSER_ALLOW_SUPERUSER=1 diff --git a/wsl/docker-compose.yml b/wsl/docker-compose.yml index 47b60197d..a3b5658f9 100755 --- a/wsl/docker-compose.yml +++ b/wsl/docker-compose.yml @@ -22,22 +22,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.27} + - PHP_VERSION=${PHP_VERSION_80:-8.0.28} - 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.27}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.28}-debian-bullseye_amd64 wsl-php-builder-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - 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-php81_${PHP_VERSION_81:-8.1.13}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-debian-bullseye_amd64 wsl-php-builder-nightly: build: @@ -56,11 +56,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - OS_TYPE=debian:bookworm-slim - DEB_URL=mirrors.ustc.edu.cn - DEB_SECURITY_URL=mirrors.ustc.edu.cn/debian-security - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-debian-bookworm_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-debian-bookworm_amd64 # https://endoflife.software/operating-systems/linux/ubuntu # https://github.com/docker-library/docs/tree/master/ubuntu @@ -80,22 +80,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.27} + - PHP_VERSION=${PHP_VERSION_80:-8.0.28} - 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.27}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.28}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu1804-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - 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-php81_${PHP_VERSION_81:-8.1.13}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu2004-74: build: @@ -113,22 +113,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.27} + - PHP_VERSION=${PHP_VERSION_80:-8.0.28} - 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.27}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.28}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2004-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - 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-php81_${PHP_VERSION_81:-8.1.13}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2204-74: build: @@ -146,22 +146,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.27} + - PHP_VERSION=${PHP_VERSION_80:-8.0.28} - 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.27}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.28}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - 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-php81_${PHP_VERSION_81:-8.1.13}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-nightly: build: @@ -180,11 +180,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - OS_TYPE=ubuntu:22.10 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-ubuntu-kinetic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-ubuntu-kinetic_amd64 # rhel @@ -210,18 +210,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.27} + - PHP_VERSION=${PHP_VERSION_80:-8.0.28} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.27}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.28}-centos-8_amd64 wsl-php-builder-rhel8-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-centos-8_amd64 wsl-php-builder-rhel9-74: build: @@ -237,18 +237,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.27} + - PHP_VERSION=${PHP_VERSION_80:-8.0.28} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.27}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.28}-centos-9_amd64 wsl-php-builder-rhel9-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-centos-9_amd64 # https://github.com/docker-library/docs/tree/master/rockylinux @@ -257,18 +257,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - OS_TYPE=rockylinux:8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-rocky-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-rocky-8_amd64 wsl-php-builder-rocky9-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - OS_TYPE=rockylinux:9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-rocky-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-rocky-9_amd64 # fedora # https://github.com/docker-library/docs/tree/master/fedora @@ -287,18 +287,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.27} + - PHP_VERSION=${PHP_VERSION_80:-8.0.28} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.27}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.28}-fedora-36_amd64 wsl-php-builder-fc36-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.13} + - PHP_VERSION=${PHP_VERSION_81:-8.1.15} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.13}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-fedora-36_amd64 wsl-php-builder-fc36-nightly: build: diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index be005d8dd..002933ed8 100755 --- a/wsl/lnmp-wsl-builder-php +++ b/wsl/lnmp-wsl-builder-php @@ -59,14 +59,14 @@ fi PHP_INSTALL_LOG=/tmp/php-builder/$(date +%s).install.log -export COMPOSER_VERSION=2.5.5 +export COMPOSER_VERSION=2.5.8 export COMPOSER_ALLOW_SUPERUSER=1 export COMPOSER_HOME=/tmp/composer export TZ=Asia/Shanghai # export CC=clang CXX=clang export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.4 +export PHP_LATEST_VERSION=8.2.5 ################################################################################ for command in "$@" diff --git a/wsl/lnmp-wsl-builder-php-rhel b/wsl/lnmp-wsl-builder-php-rhel index 676bfc005..9435a1e66 100755 --- a/wsl/lnmp-wsl-builder-php-rhel +++ b/wsl/lnmp-wsl-builder-php-rhel @@ -49,14 +49,14 @@ if [ "${LNMP_CN_ENV}" != 'false' ];then PHP_GIT=https://github.com.cnpmjs.org/php/php-src fi -export COMPOSER_VERSION=2.5.5 +export COMPOSER_VERSION=2.5.8 export COMPOSER_ALLOW_SUPERUSER=1 export COMPOSER_HOME=/tmp/composer export TZ=Asia/Shanghai # export CC=clang CXX=clang # export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.4 +export PHP_LATEST_VERSION=8.2.5 ################################################################################ # diff --git a/wsl/wsl.phpbuilder.Dockerfile b/wsl/wsl.phpbuilder.Dockerfile index 3db294015..1e4fed647 100755 --- a/wsl/wsl.phpbuilder.Dockerfile +++ b/wsl/wsl.phpbuilder.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 COPY lnmp-wsl-builder-php /lnmp-wsl-builder-php.sh diff --git a/wsl/wsl.phpbuilder.rhel.Dockerfile b/wsl/wsl.phpbuilder.rhel.Dockerfile index d39dbc3a7..fd75fa3ba 100755 --- a/wsl/wsl.phpbuilder.rhel.Dockerfile +++ b/wsl/wsl.phpbuilder.rhel.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.4 +ARG PHP_VERSION=8.2.5 COPY lnmp-wsl-builder-php-rhel /lnmp-wsl-builder-php-rhel.sh diff --git a/wsl2/kernel.next.version b/wsl2/kernel.next.version index 09b254e90..04cb4cc12 100644 --- a/wsl2/kernel.next.version +++ b/wsl2/kernel.next.version @@ -1 +1 @@ -6.0.0 +6.1.21.1 From f6fe9b983af948b99855f391f30af33a58cd9e95 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 23 Jul 2023 18:30:18 +0800 Subject: [PATCH 15/42] [Nginx] Update version to v1.25.1 Signed-off-by: Kang Huaishuai --- .env.example | 7 ++++--- CHANGELOG.md | 1 + README.cn.md | 2 +- README.md | 2 +- app/laravel-demo/Dockerfile | 2 +- app/laravel-demo/Dockerfile.buildkit | 2 +- app/laravel-demo/Dockerfile.cdn | 2 +- docker-lnmp.yml | 2 +- docker-production.yml | 4 ++-- dockerfile/nginx/.env.example | 2 +- dockerfile/nginx/README.md | 4 ++-- dockerfile/nginx/alpine/Dockerfile | 2 +- dockerfile/nginx/buster/Dockerfile | 2 +- dockerfile/nginx/docker-compose.yml | 10 +++++----- dockerfile/sync/docker-image-sync.json | 12 ++++++------ drone/.env.example | 2 +- drone/docker-ci.yml | 4 ++-- kubernetes/.env.example | 2 +- kubernetes/coreos/ignition/bu/kube-nginx.bu | 4 ++-- kubernetes/coreos/server/Dockerfile | 2 +- kubernetes/kube-nginx/Dockerfile | 2 +- kubernetes/kube-nginx/docker-compose.yml | 2 +- kubernetes/lnmp/nginx/base/lnmp-nginx.yaml | 4 ++-- scripts/docker-compose.bump.yml | 2 +- windows/lnmp-windows-pm-repo/nginx/lwpm.json | 4 ++-- windows/lnmp-windows-pm-repo/nginx/lwpm.yaml | 4 ++-- 26 files changed, 45 insertions(+), 43 deletions(-) diff --git a/.env.example b/.env.example index a18ce6016..8cad840c0 100644 --- a/.env.example +++ b/.env.example @@ -98,8 +98,8 @@ LNMP_MYSQL_PORT_X=127.0.0.1:33060 # [Redis] -LNMP_REDIS_PORT=127.0.0.1:6379 -# LNMP_REDIS_PORT=0.0.0.0:6379 +LNMP_REDIS_PORT=127.0.0.1:16379 +# LNMP_REDIS_PORT=0.0.0.0:16379 # [Memcached] @@ -118,7 +118,8 @@ TZ=Asia/Shanghai # [Version] -LNMP_NGINX_VERSION=1.23.3 +# https://nginx.org/en/CHANGES +LNMP_NGINX_VERSION=1.25.1 LNMP_MYSQL_VERSION=8.0.33 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1604a35f5..e7934b95a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,3 +15,4 @@ ### Updates: * [PHP `8.2.5` `8.1.15` `8.0.28`](https://www.php.net/ChangeLog-8.php#8.1.15) +* [Nginx `1.25.1`](https://nginx.org/en/CHANGES) diff --git a/README.cn.md b/README.cn.md index 87eb60d88..624a580ef 100644 --- a/README.cn.md +++ b/README.cn.md @@ -201,7 +201,7 @@ $ ./lnmp-docker down |Name|Docker Image|Version|Based| |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | -|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.23.3-alpine` | **1.23.3** |`alpine:3.13` | +|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.1-alpine` | **1.25.1** |`alpine:3.13` | |[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.5-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| diff --git a/README.md b/README.md index db1967754..9127a8e19 100644 --- a/README.md +++ b/README.md @@ -196,7 +196,7 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |Name|Docker Image|Version|Based| |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | -|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.23.3-alpine` | **1.23.3** |`alpine:3.13` | +|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.1-alpine` | **1.25.1** |`alpine:3.13` | |[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.5-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index d9cf38801..0430b1578 100644 --- a/app/laravel-demo/Dockerfile +++ b/app/laravel-demo/Dockerfile @@ -15,7 +15,7 @@ ARG NODE_VERSION=18.2.0 ARG PHP_VERSION=8.2.5 -ARG NGINX_VERSION=1.23.3-alpine +ARG NGINX_VERSION=1.25.1-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 diff --git a/app/laravel-demo/Dockerfile.buildkit b/app/laravel-demo/Dockerfile.buildkit index 9ce0012b1..9af4f2148 100644 --- a/app/laravel-demo/Dockerfile.buildkit +++ b/app/laravel-demo/Dockerfile.buildkit @@ -17,7 +17,7 @@ ARG NODE_VERSION=18.2.0 ARG PHP_VERSION=8.2.5 -ARG NGINX_VERSION=1.23.3-alpine +ARG NGINX_VERSION=1.25.1-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 diff --git a/app/laravel-demo/Dockerfile.cdn b/app/laravel-demo/Dockerfile.cdn index 337d8fcb9..f2323f08c 100644 --- a/app/laravel-demo/Dockerfile.cdn +++ b/app/laravel-demo/Dockerfile.cdn @@ -16,7 +16,7 @@ # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.cdn --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG PHP_VERSION=8.2.5 -ARG NGINX_VERSION=1.23.3-alpine +ARG NGINX_VERSION=1.25.1-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 diff --git a/docker-lnmp.yml b/docker-lnmp.yml index 66296d6c4..deaad5894 100644 --- a/docker-lnmp.yml +++ b/docker-lnmp.yml @@ -265,7 +265,7 @@ services: nginx: << : [*common,*common-labels] - image: "${LNMP_LIBRARY_NS:-library}/nginx:${LNMP_NGINX_VERSION:-1.23.3}-alpine" + image: "${LNMP_LIBRARY_NS:-library}/nginx:${LNMP_NGINX_VERSION:-1.25.1}-alpine" ports: - "${LNMP_NGINX_HTTPS_PORT:-0.0.0.0:443}:443/udp" - "${LNMP_NGINX_HTTPS_PORT:-0.0.0.0:443}:443/tcp" diff --git a/docker-production.yml b/docker-production.yml index 1efc88436..04f4a9d1f 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -419,8 +419,8 @@ services: # context: ./dockerfile/nginx/ context: ./config/nginx dockerfile: Dockerfile - image: nginx:1.23.3-alpine - # image: khs1994/nginx:1.23.3-alpine + image: nginx:1.25.1-alpine + # image: khs1994/nginx:1.25.1-alpine ports: - "443:443/tcp" - "443:443/udp" diff --git a/dockerfile/nginx/.env.example b/dockerfile/nginx/.env.example index 7ef48a370..6828ea539 100644 --- a/dockerfile/nginx/.env.example +++ b/dockerfile/nginx/.env.example @@ -1 +1 @@ -NGINX_VERSION=1.23.3 +NGINX_VERSION=1.25.1 diff --git a/dockerfile/nginx/README.md b/dockerfile/nginx/README.md index f3327d046..780864c82 100644 --- a/dockerfile/nginx/README.md +++ b/dockerfile/nginx/README.md @@ -36,7 +36,7 @@ version: "3" services: nginx: - image: "khs1994/nginx:1.23.3-alpine" + image: "khs1994/nginx:1.25.1-alpine" ports: - "80:80" - "443:443/tcp" @@ -57,7 +57,7 @@ $ docker run -dit \ -p 443:443/udp \ -v $PWD/app:/app \ -v $PWD/conf.d:/etc/nginx/conf.d \ - khs1994/nginx:1.23.3-alpine + khs1994/nginx:1.25.1-alpine ``` # Who use it? diff --git a/dockerfile/nginx/alpine/Dockerfile b/dockerfile/nginx/alpine/Dockerfile index 9f381fb33..d7c136455 100644 --- a/dockerfile/nginx/alpine/Dockerfile +++ b/dockerfile/nginx/alpine/Dockerfile @@ -34,7 +34,7 @@ FROM alpine:3.16 LABEL maintainer="khs1994.com nginx With HTTP3" -ARG NGINX_VERSION=1.23.3 +ARG NGINX_VERSION=1.25.1 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/nginx/buster/Dockerfile b/dockerfile/nginx/buster/Dockerfile index b24a10ab1..048a4ec8e 100644 --- a/dockerfile/nginx/buster/Dockerfile +++ b/dockerfile/nginx/buster/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster-slim -ARG NGINX_VERSION=1.23.3 +ARG NGINX_VERSION=1.25.1 ARG DEB_URL=deb.debian.org diff --git a/dockerfile/nginx/docker-compose.yml b/dockerfile/nginx/docker-compose.yml index 9c0bbf5be..7752bacd3 100644 --- a/dockerfile/nginx/docker-compose.yml +++ b/dockerfile/nginx/docker-compose.yml @@ -6,10 +6,10 @@ services: context: ./alpine args: # OPENSSL_BRANCH: master - NGINX_VERSION: ${NGINX_VERSION:-1.23.3} + NGINX_VERSION: ${NGINX_VERSION:-1.25.1} ALPINE_URL: mirrors.aliyun.com # dl-cdn.alpinelinux.org OPENSSL_URL: https://github.com.cnpmjs.org/google/boringssl - image: khs1994/nginx:${NGINX_VERSION:-1.23.3}-alpine + image: khs1994/nginx:${NGINX_VERSION:-1.25.1}-alpine ports: - 443:443/tcp - 443:443/udp @@ -23,11 +23,11 @@ services: context: ./buster args: # OPENSSL_BRANCH: master - NGINX_VERSION: ${NGINX_VERSION:-1.23.3} + NGINX_VERSION: ${NGINX_VERSION:-1.25.1} OPENSSL_URL: https://github.com.cnpmjs.org/google/boringssl DEB_URL: mirrors.ustc.edu.cn # deb.debian.org DEB_SECURITY_URL: mirrors.ustc.edu.cn/debian-security # security.debian.org/debian-security - image: khs1994/nginx:${NGINX_VERSION:-1.23.3}-buster + image: khs1994/nginx:${NGINX_VERSION:-1.25.1}-buster ports: - 443:443/tcp - 443:443/udp @@ -36,7 +36,7 @@ services: - ./conf.d:/etc/nginx/conf.d:ro official: - image: nginx:1.23.3-alpine + image: nginx:1.25.1-alpine ports: - 443:443 - 80:80 diff --git a/dockerfile/sync/docker-image-sync.json b/dockerfile/sync/docker-image-sync.json index c28c3cab8..1ca38e0c8 100644 --- a/dockerfile/sync/docker-image-sync.json +++ b/dockerfile/sync/docker-image-sync.json @@ -156,12 +156,12 @@ "dest": "library-mirror/nginx:alpine" }, { - "source": "library/nginx:1.22.1-alpine", - "dest": "library-mirror/nginx:1.22.1-alpine" + "source": "library/nginx:1.24.0-alpine", + "dest": "library-mirror/nginx:1.24.0-alpine" }, { - "source": "library/nginx:1.23.3-alpine", - "dest": "library-mirror/nginx:1.23.3-alpine" + "source": "library/nginx:1.25.1-alpine", + "dest": "library-mirror/nginx:1.25.1-alpine" }, { "source": "library/httpd:alpine", @@ -238,7 +238,7 @@ "source": "khs1994/tls" }, { - "source": "khs1994/kube-nginx:1.23.3" + "source": "khs1994/kube-nginx:1.25.1" }, { "source": "khs1994/kube-nginx" @@ -253,7 +253,7 @@ "source": "khs1994/nginx:alpine" }, { - "source": "khs1994/nginx:1.23.3-alpine" + "source": "khs1994/nginx:1.25.1-alpine" }, { "source": "khs1994/docker-image-sync:latest" diff --git a/drone/.env.example b/drone/.env.example index fd4aca8de..98b37748c 100644 --- a/drone/.env.example +++ b/drone/.env.example @@ -147,7 +147,7 @@ DRONE_UI_PASSWORD=root CI_DB_TYPE= CI_DRONE_VERSION=2.16.0 -CI_NGINX_VERSION=1.23.3 +CI_NGINX_VERSION=1.25.1 CI_REDIS_VERSION=7.0.0 CI_MYSQL_VERSION=8.0.33 diff --git a/drone/docker-ci.yml b/drone/docker-ci.yml index 724d3188c..e20d3891d 100644 --- a/drone/docker-ci.yml +++ b/drone/docker-ci.yml @@ -89,8 +89,8 @@ services: nginx: << : *common - # image: khs1994/nginx:${CI_NGINX_VERSION:-1.23.3}-alpine - image: nginx:${CI_NGINX_VERSION:-1.23.3}-alpine + # image: khs1994/nginx:${CI_NGINX_VERSION:-1.25.1}-alpine + image: nginx:${CI_NGINX_VERSION:-1.25.1}-alpine networks: - frontend ports: diff --git a/kubernetes/.env.example b/kubernetes/.env.example index 528450887..a25a68415 100644 --- a/kubernetes/.env.example +++ b/kubernetes/.env.example @@ -19,7 +19,7 @@ HELM_VERSION=3.11.3 CNI_VERSION=1.2.0 # https://github.com/kubernetes-sigs/cri-tools/releases CRICTL_VERSION=1.27.0 -NGINX_VERSION=1.23.3 +NGINX_VERSION=1.25.1 # https://github.com/containerd/containerd/releases CONTAINERD_VERSION=1.7.0 # https://github.com/containers/conmon/releases diff --git a/kubernetes/coreos/ignition/bu/kube-nginx.bu b/kubernetes/coreos/ignition/bu/kube-nginx.bu index 71d7aa20c..acb24195c 100644 --- a/kubernetes/coreos/ignition/bu/kube-nginx.bu +++ b/kubernetes/coreos/ignition/bu/kube-nginx.bu @@ -18,8 +18,8 @@ systemd: # ExecStart=${K8S_ROOT}/kube-nginx/sbin/nginx -c ${K8S_ROOT}/kube-nginx/conf/kube-nginx.conf -p ${K8S_ROOT}/kube-nginx # ExecReload=${K8S_ROOT}/kube-nginx/sbin/nginx -c ${K8S_ROOT}/kube-nginx/conf/kube-nginx.conf -p ${K8S_ROOT}/kube-nginx -s reload ExecStartPre=-/bin/podman container rm kube-nginx - ExecStartPre=/bin/podman container run --rm $OPTIONS khs1994/kube-nginx:1.23.3 -t - ExecStart=/bin/podman container run --name kube-nginx $OPTIONS khs1994/kube-nginx:1.23.3 + ExecStartPre=/bin/podman container run --rm $OPTIONS khs1994/kube-nginx:1.25.1 -t + ExecStart=/bin/podman container run --name kube-nginx $OPTIONS khs1994/kube-nginx:1.25.1 ExecStop=/bin/podman container stop kube-nginx ExecStopPost=/bin/podman container rm kube-nginx PrivateTmp=true diff --git a/kubernetes/coreos/server/Dockerfile b/kubernetes/coreos/server/Dockerfile index edfc3adca..6b81edcfc 100644 --- a/kubernetes/coreos/server/Dockerfile +++ b/kubernetes/coreos/server/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.23.3-alpine +FROM nginx:1.25.1-alpine LABEL maintainer="khs1994@khs1994.com" diff --git a/kubernetes/kube-nginx/Dockerfile b/kubernetes/kube-nginx/Dockerfile index efe0a3030..5aeaa1052 100644 --- a/kubernetes/kube-nginx/Dockerfile +++ b/kubernetes/kube-nginx/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NGINX_VERSION=1.23.3 +ENV NGINX_VERSION=1.25.1 RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \ && apk add --no-cache --virtual .build_deps \ diff --git a/kubernetes/kube-nginx/docker-compose.yml b/kubernetes/kube-nginx/docker-compose.yml index 82ab069c7..86c52482b 100644 --- a/kubernetes/kube-nginx/docker-compose.yml +++ b/kubernetes/kube-nginx/docker-compose.yml @@ -2,6 +2,6 @@ services: kube-nginx: - image: khs1994/kube-nginx:1.23.3 + image: khs1994/kube-nginx:1.25.1 build: context: ./ diff --git a/kubernetes/lnmp/nginx/base/lnmp-nginx.yaml b/kubernetes/lnmp/nginx/base/lnmp-nginx.yaml index b3c8c5ef8..9841cb5f3 100644 --- a/kubernetes/lnmp/nginx/base/lnmp-nginx.yaml +++ b/kubernetes/lnmp/nginx/base/lnmp-nginx.yaml @@ -33,8 +33,8 @@ spec: terminationGracePeriodSeconds: 60 containers: - name: lnmp-nginx - # image: khs1994/nginx:1.23.3-alpine - image: "nginx:1.23.3-alpine" + # image: khs1994/nginx:1.25.1-alpine + image: "nginx:1.25.1-alpine" # image: ranadeeppolavarapu/nginx-http3 imagePullPolicy: IfNotPresent args: diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index a766c0eec..489e7b27f 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -20,7 +20,7 @@ services: image: composer:2.5.8 nginx: - image: nginx:1.23.3-alpine + image: nginx:1.25.1-alpine nginx-unit: image: docker.io/nginx/unit:1.30.0-minimal diff --git a/windows/lnmp-windows-pm-repo/nginx/lwpm.json b/windows/lnmp-windows-pm-repo/nginx/lwpm.json index f7e0b5b7f..39d6248ba 100644 --- a/windows/lnmp-windows-pm-repo/nginx/lwpm.json +++ b/windows/lnmp-windows-pm-repo/nginx/lwpm.json @@ -8,7 +8,7 @@ "path": [ "C:\\nginx" ], - "pre-version": "1.23.3", + "pre-version": "1.25.1", "releases": "https://nginx.org/en/download.html", "scripts": { "install": "_cleanup nginx\n_unzip $filename nginx\n\n_mkdir C:\\nginx\n\nif(Test-Path C:\\nginx\\conf\\nginx.conf){\nCopy-Item C:\\nginx\\conf\\nginx.conf ~/Downloads/lnmp-docker-cache/nginx.conf.backup\n}\n\nCopy-item -r -force \"nginx\\nginx-${VERSION}\\*\" \"C:\\nginx\"\n\n_cleanup nginx\n\ncp $home/lnmp/windows/config/nginx.conf C:/nginx/conf\n", @@ -28,5 +28,5 @@ }, "url": "https://nginx.org/download/nginx-${VERSION}.zip", "url-mirror": "https://repo.huaweicloud.com/nginx/nginx-${VERSION}.zip", - "version": "1.22.1" + "version": "1.24.0" } diff --git a/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml b/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml index 97ed237b8..9461ff5e3 100644 --- a/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml @@ -1,7 +1,7 @@ name: "nginx" description: "small, powerful, scalable web/proxy server" -version: "1.22.1" -pre-version: "1.23.3" +version: "1.24.0" +pre-version: "1.25.1" homepage: "https://nginx.org" bug: "http://nginx.org/en/support.html" github: "nginx/nginx" From fa588e635dc37926455b237244599262ddc03d43 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 23 Jul 2023 22:32:21 +0800 Subject: [PATCH 16/42] [lwpm] Add MariaDB Signed-off-by: Kang Huaishuai --- .../lnmp-windows-pm-repo/mariadb/lwpm.json | 27 ++++++++ .../lnmp-windows-pm-repo/mariadb/lwpm.yaml | 69 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 windows/lnmp-windows-pm-repo/mariadb/lwpm.json create mode 100644 windows/lnmp-windows-pm-repo/mariadb/lwpm.yaml diff --git a/windows/lnmp-windows-pm-repo/mariadb/lwpm.json b/windows/lnmp-windows-pm-repo/mariadb/lwpm.json new file mode 100644 index 000000000..75e52f537 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/mariadb/lwpm.json @@ -0,0 +1,27 @@ +{ + "bug": "", + "command": "mariadb", + "description": "MariaDB server is a community developed fork of MySQL server. ", + "download-filename": "mariadb-${VERSION}-winx64.zip", + "github": "MariaDB/server", + "homepage": "https://mariadb.org/", + "name": "mariadb", + "path": [ + "C:\\mariadb\\bin" + ], + "pre-version": "10.11.4", + "scripts": { + "install": "_cleanup mariadb\n_unzip $filename mariadb\n\n_mkdir C:\\mariadb\nCopy-item -r -force \"mariadb\\mariadb-${VERSION}-winx64\\*\" \"C:\\mariadb\\\"\n\n_cleanup mariadb\n", + "platform-reqs": "if(!$IsWindows){echo $False}", + "postinstall": "if(!(Test-Path C:\\mariadb\\data)){\nmkdir C:\\mariadb\\data\n\nWrite-Host \"MariaDB is init ...\"\n\nC:\\mariadb\\bin\\mysql_install_db.exe --port 3307 -D -R -proot\n\n# 安装服务\n\n_sudo mariadbd --install mariadb\n\n# 禁止开机启动\n\n_sudo set-service mariadb -StartupType Manual\n}\n\nWrite-host \"\n\nPlease exec command start(or init) mariadb\n\n$ net start mariadb\n\n$ C:\\mariadb\\bin\\mariadb.exe -uroot -proot\n\"\n", + "preinstall": [ + "# https://docs.microsoft.com/zh-cn/cpp/windows/redistributing-visual-cpp-files?view=msvc-170#install-the-redistributable-packages\n# check vclib installed\nif(!(Test-Path 'HKLM:\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64')){\n PrintError 'Please install vclib first, exec $ lpm install vclib'\n\n exit 1\n}\n\nif((Get-ItemProperty 'HKLM:\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64').Installed -ne 1){\n PrintError 'Please install vclib first, exec $ lpm install vclib'\n\n exit 1\n}\n\nprintInfo 'vclib already installed, continue ...'\n" + ], + "test": "printInfo mariadb (C:\\mariadb\\bin\\mysql --version).split(' ')[5].split('-')[0] install success", + "uninstall": "_sudo mariadbd --remove\n_cleanup C:\\mariadb\n", + "version": "(mariadb --version).split(\" \")[3]" + }, + "url": "https://mirrors.aliyun.com/mariadb/mariadb-${VERSION}/winx64-packages/mariadb-${VERSION}-winx64.zip", + "url-mirror": "https://mirrors4.tuna.tsinghua.edu.cn/mariadb/mariadb-${VERSION}/winx64-packages/mariadb-${VERSION}-winx64.zip", + "version": "10.11.4" +} diff --git a/windows/lnmp-windows-pm-repo/mariadb/lwpm.yaml b/windows/lnmp-windows-pm-repo/mariadb/lwpm.yaml new file mode 100644 index 000000000..39fdf49ca --- /dev/null +++ b/windows/lnmp-windows-pm-repo/mariadb/lwpm.yaml @@ -0,0 +1,69 @@ +name: mariadb +description: 'MariaDB server is a community developed fork of MySQL server. ' +version: "10.11.4" +pre-version: "10.11.4" +homepage: "https://mariadb.org/" +bug: "" +github: "MariaDB/server" +url: "https://mirrors.aliyun.com/mariadb/mariadb-${VERSION}/winx64-packages/mariadb-${VERSION}-winx64.zip" +url-mirror: "https://mirrors4.tuna.tsinghua.edu.cn/mariadb/mariadb-${VERSION}/winx64-packages/mariadb-${VERSION}-winx64.zip" +download-filename: mariadb-${VERSION}-winx64.zip +scripts: + postinstall: | + if(!(Test-Path C:\mariadb\data)){ + mkdir C:\mariadb\data + + Write-Host "MariaDB is init ..." + + C:\mariadb\bin\mysql_install_db.exe --port 3307 -D -R -proot + + # 安装服务 + + _sudo mariadbd --install mariadb + + # 禁止开机启动 + + _sudo set-service mariadb -StartupType Manual + } + + Write-host " + + Please exec command start(or init) mariadb + + $ net start mariadb + + $ C:\mariadb\bin\mariadb.exe -uroot -proot + " + install: | + _cleanup mariadb + _unzip $filename mariadb + + _mkdir C:\mariadb + Copy-item -r -force "mariadb\mariadb-${VERSION}-winx64\*" "C:\mariadb\" + + _cleanup mariadb + test: printInfo mariadb (C:\mariadb\bin\mysql --version).split(' ')[5].split('-')[0] install success + uninstall: | + _sudo mariadbd --remove + _cleanup C:\mariadb + version: (mariadb --version).split(" ")[3] + platform-reqs: if(!$IsWindows){echo $False} + preinstall: + - | + # https://docs.microsoft.com/zh-cn/cpp/windows/redistributing-visual-cpp-files?view=msvc-170#install-the-redistributable-packages + # check vclib installed + if(!(Test-Path 'HKLM:\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\X64')){ + PrintError 'Please install vclib first, exec $ lpm install vclib' + + exit 1 + } + + if((Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\X64').Installed -ne 1){ + PrintError 'Please install vclib first, exec $ lpm install vclib' + + exit 1 + } + + printInfo 'vclib already installed, continue ...' +path: ["C:\\mariadb\\bin"] +command: mariadb From 7944c077bf9b2166c80442c07461d0621f8d3caa Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Fri, 18 Aug 2023 16:17:49 +0800 Subject: [PATCH 17/42] [Kubernetes] v1.28.0 [sync git] --- kubernetes/.env.example | 2 +- kubernetes/.github/workflows/setup-k8s.yaml | 38 +++++++++---------- kubernetes/bin/lwpm.ps1 | 4 +- kubernetes/cfssl/Dockerfile | 2 +- kubernetes/docker-compose.bump.yml | 2 +- kubernetes/kubernetes-release/Dockerfile | 2 +- .../kubernetes-release/Dockerfile.buildx | 2 +- .../kubernetes-release/release/stable.txt | 2 +- kubernetes/rpi/README.md | 2 +- kubernetes/wsl2/00-README.NODE.md | 4 +- kubernetes/wsl2/00-README.SERVER.md | 4 +- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/kubernetes/.env.example b/kubernetes/.env.example index a25a68415..f1cae0134 100644 --- a/kubernetes/.env.example +++ b/kubernetes/.env.example @@ -1,4 +1,4 @@ -KUBERNETES_VERSION=1.27.0 +KUBERNETES_VERSION=1.28.0 # KUBERNETES_VERSION= diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index 44fc570e4..c04492198 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -44,23 +44,23 @@ jobs: # GENERATE_CLI_HELP: "true" # next version - - os: ubuntu - dist: 20.04 - CI_KUBERNETES_VERSION: 1.28.0-beta.0 - LNMP_K8S_GET: --url - GENERATE_CLI_HELP: "true" + # - os: ubuntu + # dist: 20.04 + # CI_KUBERNETES_VERSION: 1.29.0-alpha.1 + # LNMP_K8S_GET: --url + # GENERATE_CLI_HELP: "true" # current stable version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.27.0 + CI_KUBERNETES_VERSION: 1.28.0 LNMP_K8S_LOCAL_INSTALL_OPTIONS: --crio K8S_IMAGE_NS: khs1994 K8S_IMAGE_REGISTRY: useccr.ccs.tencentyun.com UPLOAD_TO_CODING: "true" - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.27.0 + CI_KUBERNETES_VERSION: 1.28.0 LNMP_K8S_GET: --url GENERATE_CLI_HELP: "true" @@ -69,12 +69,12 @@ jobs: # ipv6 # - os: ubuntu # dist: 20.04 - # CI_KUBERNETES_VERSION: 1.27.0 + # CI_KUBERNETES_VERSION: 1.28.0 # LNMP_K8S_GET: --url # IPV6: "true" - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.27.0 + CI_KUBERNETES_VERSION: 1.28.0 LNMP_K8S_GET: --url CNI_CALICO_EBPF: 'true' # v1.24.0+ not support docker @@ -84,21 +84,21 @@ jobs: # LNMP_K8S_LOCAL_INSTALL_OPTIONS: --docker - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.27.0 + CI_KUBERNETES_VERSION: 1.28.0 LNMP_K8S_GET: --url K8S_ROOT: /opt/k8s-custom # old version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.26.4 + CI_KUBERNETES_VERSION: 1.27.4 LNMP_K8S_GET: --url - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.25.9 + CI_KUBERNETES_VERSION: 1.26.7 LNMP_K8S_GET: --url - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.24.13 + CI_KUBERNETES_VERSION: 1.25.12 LNMP_K8S_GET: --url fail-fast: false steps: @@ -516,7 +516,7 @@ jobs: export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH BASE_BRANCH=master # BASE_BRANCH=v1.25.0-config - if ! [ $CI_KUBERNETES_VERSION = '1.27.0' -a "$GENERATE_CLI_HELP" = "true" ];then + if ! [ $CI_KUBERNETES_VERSION = '1.28.0' -a "$GENERATE_CLI_HELP" = "true" ];then exit 0 fi @@ -542,9 +542,9 @@ jobs: run: | export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH - BASE_BRANCH=v1.28.0-alpha.2-config - # BASE_BRANCH=master - if [ $CI_KUBERNETES_VERSION != '1.28.0-beta.0' ];then + BASE_BRANCH=v1.29.0-alpha.1-config + BASE_BRANCH=master + if [ $CI_KUBERNETES_VERSION != '1.29.0-alpha.1' ];then exit 0 fi @@ -571,8 +571,8 @@ jobs: | export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH BASE_BRANCH=v1.28.0-alpha.1 - # BASE_BRANCH=master - if [ $CI_KUBERNETES_VERSION != '1.29.0-alpha.1' ];then + BASE_BRANCH=master + if [ $CI_KUBERNETES_VERSION != 'x.y.z-alpha.1' ];then exit 0 fi diff --git a/kubernetes/bin/lwpm.ps1 b/kubernetes/bin/lwpm.ps1 index cd84d956d..46da5bd84 100644 --- a/kubernetes/bin/lwpm.ps1 +++ b/kubernetes/bin/lwpm.ps1 @@ -1,9 +1,9 @@ $env:LWPM_DOCKER_REGISTRY="mirror.ccs.tencentyun.com" ./lnmp/windows/lnmp-windows-pm.ps1 add ` - kubernetes-node@1.27.0 ` + kubernetes-node@1.28.0 ` --all-platform $env:LWPM_DOCKER_REGISTRY=$env:LWPM_DOCKER_REGISTRY_MIRROR -./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@1.27.0 +./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@1.28.0 diff --git a/kubernetes/cfssl/Dockerfile b/kubernetes/cfssl/Dockerfile index b0808db7b..329c3b60a 100644 --- a/kubernetes/cfssl/Dockerfile +++ b/kubernetes/cfssl/Dockerfile @@ -1,6 +1,6 @@ FROM --platform=${TARGETPLATFORM} alpine:edge as tool -ENV KUBECTL_VERSION=v1.27.0 +ENV KUBECTL_VERSION=v1.28.0 ARG TARGETARCH diff --git a/kubernetes/docker-compose.bump.yml b/kubernetes/docker-compose.bump.yml index 0ffe62d8f..2ab7f9d37 100644 --- a/kubernetes/docker-compose.bump.yml +++ b/kubernetes/docker-compose.bump.yml @@ -2,7 +2,7 @@ services: k8s_apiserver: - image: registry.k8s.io/kube-apiserver:v1.27.0 + image: registry.k8s.io/kube-apiserver:v1.28.0 etcd: image: quay.io/coreos/etcd:v3.5.8 diff --git a/kubernetes/kubernetes-release/Dockerfile b/kubernetes/kubernetes-release/Dockerfile index feeab45d8..947c81c63 100644 --- a/kubernetes/kubernetes-release/Dockerfile +++ b/kubernetes/kubernetes-release/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV KUBERNETES_VERSION=v1.27.0 +ENV KUBERNETES_VERSION=v1.28.0 # ENV KUBERNETES_VERSION= diff --git a/kubernetes/kubernetes-release/Dockerfile.buildx b/kubernetes/kubernetes-release/Dockerfile.buildx index e8e2fe8a1..e127c911d 100644 --- a/kubernetes/kubernetes-release/Dockerfile.buildx +++ b/kubernetes/kubernetes-release/Dockerfile.buildx @@ -6,7 +6,7 @@ FROM alpine -ARG KUBERNETES_VERSION=v1.27.0 +ARG KUBERNETES_VERSION=v1.28.0 # ARG KUBERNETES_VERSION= diff --git a/kubernetes/kubernetes-release/release/stable.txt b/kubernetes/kubernetes-release/release/stable.txt index df407721e..c70e54109 100644 --- a/kubernetes/kubernetes-release/release/stable.txt +++ b/kubernetes/kubernetes-release/release/stable.txt @@ -1 +1 @@ -v1.27.0 +v1.28.0 diff --git a/kubernetes/rpi/README.md b/kubernetes/rpi/README.md index f202ea1a1..635457a29 100644 --- a/kubernetes/rpi/README.md +++ b/kubernetes/rpi/README.md @@ -24,7 +24,7 @@ $ foreach($item in $items){scp ./wsl2/certs/$item pi@192.168.199.101:/home/pi/ln $ $items="kube-proxy","kubelet","kubectl","kubeadm","mounter" -$ foreach($item in $items){scp ./kubernetes-release/release/v1.27.0-linux-arm64/kubernetes/server/bin/$item pi@192.168.199.101:/home/pi/} +$ foreach($item in $items){scp ./kubernetes-release/release/v1.28.0-linux-arm64/kubernetes/server/bin/$item pi@192.168.199.101:/home/pi/} ``` ## 登录到树莓派 diff --git a/kubernetes/wsl2/00-README.NODE.md b/kubernetes/wsl2/00-README.NODE.md index 51575098e..cdc8ef999 100644 --- a/kubernetes/wsl2/00-README.NODE.md +++ b/kubernetes/wsl2/00-README.NODE.md @@ -44,8 +44,8 @@ $ ./wsl2/bin/kube-check $ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION" $ $env:K8S_ROOT="/wsl/wsl-k8s-data/k8s" -# 请将 1.27.0 替换为实际的 k8s 版本号 -$ $env:KUBERNETES_VERSION='1.27.0' +# 请将 1.28.0 替换为实际的 k8s 版本号 +$ $env:KUBERNETES_VERSION='1.28.0' $ wsl -d wsl-k8s -- sh -xc 'mkdir -p ${K8S_ROOT:?err}/bin' $ wsl -d wsl-k8s -- bash -xc 'cp -a kubernetes-release/release/v${KUBERNETES_VERSION}-linux-amd64/kubernetes/server/bin/{kube-proxy,kubectl,kubelet,kubeadm,mounter} ${K8S_ROOT:?err}/bin' diff --git a/kubernetes/wsl2/00-README.SERVER.md b/kubernetes/wsl2/00-README.SERVER.md index 20d0eb62e..3d1196195 100644 --- a/kubernetes/wsl2/00-README.SERVER.md +++ b/kubernetes/wsl2/00-README.SERVER.md @@ -209,8 +209,8 @@ $ wsl -d wsl-k8s -- sh -xc 'cp ${K8S_ROOT:?err}/etc/kubernetes/pki/*.yaml $ wsl -d wsl-k8s -- sh -xc 'cp ${K8S_ROOT:?err}/etc/kubernetes/pki/*.kubeconfig ${K8S_ROOT:?err}/etc/kubernetes' $ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION" -# 请将 1.27.0 替换为实际的 k8s 版本号 -$ $env:KUBERNETES_VERSION='1.27.0' +# 请将 1.28.0 替换为实际的 k8s 版本号 +$ $env:KUBERNETES_VERSION='1.28.0' $ wsl -d wsl-k8s -- bash -xc 'cp -a kubernetes-release/release/v${KUBERNETES_VERSION}-linux-amd64/kubernetes/server/bin/kube-{apiserver,controller-manager,scheduler} ${K8S_ROOT:?err}/bin' ``` From 1571e330737eb5fce6889c79e82eb3e21111e055 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Thu, 24 Aug 2023 17:44:54 +0800 Subject: [PATCH 18/42] [wsl2] Update kernel config [sync git] Signed-off-by: Kang Huaishuai --- .github/workflows/sync-git.yml | 11 + wsl2/kernel/.github/workflows/ci.yaml | 13 +- wsl2/kernel/config-wsl-5.15 | 4185 +++++++++++++++++ .../{config-wsl-5.10 => config-wsl-6.1} | 0 4 files changed, 4206 insertions(+), 3 deletions(-) create mode 100644 wsl2/kernel/config-wsl-5.15 rename wsl2/kernel/{config-wsl-5.10 => config-wsl-6.1} (100%) diff --git a/.github/workflows/sync-git.yml b/.github/workflows/sync-git.yml index de483b60f..1d4e438cf 100644 --- a/.github/workflows/sync-git.yml +++ b/.github/workflows/sync-git.yml @@ -177,3 +177,14 @@ jobs: # PCIT_MESSAGE: Sync from khs1994-docker/lnmp@${{github.sha}} by PCIT PCIT_TARGET_BRANCH: master # PCIT_USERNAME: khs1994 + - name: sync-wsl2-kernel + uses: docker://pcit/pages + env: + # PCIT_EMAIL: khs1994@khs1994.com + # PCIT_GIT_TOKEN: ${{ secrets.PCIT_GIT_TOKEN }} + PCIT_GIT_URL: github.com/khs1994/WSL2-Linux-Kernel + # PCIT_KEEP_HISTORY: "true" + PCIT_LOCAL_DIR: wsl2/kernel + # PCIT_MESSAGE: Sync from khs1994-docker/lnmp@${{github.sha}} by PCIT + PCIT_TARGET_BRANCH: master + # PCIT_USERNAME: khs1994 diff --git a/wsl2/kernel/.github/workflows/ci.yaml b/wsl2/kernel/.github/workflows/ci.yaml index 73d72ec0b..4d876fa71 100644 --- a/wsl2/kernel/.github/workflows/ci.yaml +++ b/wsl2/kernel/.github/workflows/ci.yaml @@ -18,10 +18,12 @@ jobs: strategy: matrix: repo: ["microsoft/WSL2-Linux-Kernel","torvalds/linux"] - ref: ["master","linux-msft-wsl-5.15.y"] + ref: ["master","linux-msft-wsl-5.15.y","linux-msft-wsl-6.1.y"] exclude: - repo: "torvalds/linux" ref: "linux-msft-wsl-5.15.y" + - repo: "torvalds/linux" + ref: "linux-msft-wsl-6.1.y" - repo: microsoft/WSL2-Linux-Kernel ref: master fail-fast: false @@ -49,9 +51,14 @@ jobs: mkdir -p Microsoft/ - if [ $ref = "linux-msft-wsl-5.15.y" -o $ref = "master" ];then + if [ $ref = "master" -o $ref = "linux-msft-wsl-6.1.y" ];then + curl -fsSL -o Microsoft/config-wsl \ + https://github.com/khs1994/WSL2-Linux-Kernel/raw/master/config-wsl-6.1 + fi + + if [ $ref = "linux-msft-wsl-5.15.y" ];then curl -fsSL -o Microsoft/config-wsl \ - https://github.com/khs1994/WSL2-Linux-Kernel/raw/master/config-wsl-5.10 + https://github.com/khs1994/WSL2-Linux-Kernel/raw/master/config-wsl-5.15 fi echo " diff --git a/wsl2/kernel/config-wsl-5.15 b/wsl2/kernel/config-wsl-5.15 new file mode 100644 index 000000000..9e5595f73 --- /dev/null +++ b/wsl2/kernel/config-wsl-5.15 @@ -0,0 +1,4185 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86 5.15.90.3 Kernel Configuration +# +CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.1.0-1ubuntu1~20.04) 11.1.0" +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=110100 +CONFIG_CLANG_VERSION=0 +CONFIG_AS_IS_GNU=y +CONFIG_AS_VERSION=23400 +CONFIG_LD_IS_BFD=y +CONFIG_LD_VERSION=23400 +CONFIG_LLD_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y +CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_CC_HAS_ASM_INLINE=y +CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_TABLE_SORT=y +CONFIG_THREAD_INFO_IN_TASK=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +# CONFIG_COMPILE_TEST is not set +# CONFIG_WERROR is not set +CONFIG_LOCALVERSION="-microsoft-standard-WSL2" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_BUILD_SALT="" +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_LZ4=y +CONFIG_HAVE_KERNEL_ZSTD=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set +# CONFIG_KERNEL_ZSTD is not set +CONFIG_DEFAULT_INIT="" +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +# CONFIG_WATCH_QUEUE is not set +CONFIG_CROSS_MEMORY_ATTACH=y +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_MIGRATION=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +CONFIG_IRQ_MSI_IOMMU=y +CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y +CONFIG_GENERIC_IRQ_RESERVATION_MODE=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +# CONFIG_GENERIC_IRQ_DEBUGFS is not set +# end of IRQ subsystem + +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_INIT=y +CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y +CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y +# end of Timers subsystem + +CONFIG_BPF=y +CONFIG_HAVE_EBPF_JIT=y +CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y + +# +# BPF subsystem +# +CONFIG_BPF_SYSCALL=y +CONFIG_BPF_JIT=y +CONFIG_BPF_JIT_ALWAYS_ON=y +CONFIG_BPF_JIT_DEFAULT_ON=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y +# CONFIG_BPF_PRELOAD is not set +# CONFIG_BPF_LSM is not set +# end of BPF subsystem + +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +# CONFIG_SCHED_CORE is not set + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +# CONFIG_PSI is not set +# end of CPU/Task time and stats accounting + +# CONFIG_CPU_ISOLATION is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TREE_SRCU=y +CONFIG_TASKS_RCU_GENERIC=y +CONFIG_TASKS_RUDE_RCU=y +CONFIG_TASKS_TRACE_RCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +# end of RCU Subsystem + +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +# CONFIG_IKHEADERS is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 +# CONFIG_PRINTK_INDEX is not set +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y + +# +# Scheduler features +# +# end of Scheduler features + +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y +CONFIG_CC_HAS_INT128=y +CONFIG_ARCH_SUPPORTS_INT128=y +CONFIG_CGROUPS=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_KMEM=y +CONFIG_BLK_CGROUP=y +CONFIG_CGROUP_WRITEBACK=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_CGROUP_PIDS=y +CONFIG_CGROUP_RDMA=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_BPF=y +CONFIG_CGROUP_MISC=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_SOCK_CGROUP_DATA=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_TIME_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_CHECKPOINT_RESTORE=y +# CONFIG_SCHED_AUTOGROUP is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set +CONFIG_RD_ZSTD=y +# CONFIG_BOOT_CONFIG is not set +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y +CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_EXPERT=y +# CONFIG_UID16 is not set +CONFIG_MULTIUSER=y +CONFIG_SGETMASK_SYSCALL=y +CONFIG_SYSFS_SYSCALL=y +CONFIG_FHANDLE=y +CONFIG_POSIX_TIMERS=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_FUTEX_PI=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_IO_URING=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_HAVE_ARCH_USERFAULTFD_WP=y +CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y +CONFIG_MEMBARRIER=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_USERFAULTFD=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y +# CONFIG_PC104 is not set + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +# end of Kernel Performance Events And Counters + +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_SLAB_MERGE_DEFAULT is not set +# CONFIG_SLAB_FREELIST_RANDOM is not set +# CONFIG_SLAB_FREELIST_HARDENED is not set +# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set +# CONFIG_SLUB_CPU_PARTIAL is not set +CONFIG_SYSTEM_DATA_VERIFICATION=y +# CONFIG_PROFILING is not set +CONFIG_TRACEPOINTS=y +# end of General setup + +CONFIG_64BIT=y +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_MMU=y +CONFIG_ARCH_MMAP_RND_BITS_MIN=28 +CONFIG_ARCH_MMAP_RND_BITS_MAX=32 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_FILTER_PGPROT=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_NR_GPIO=1024 +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_AUDIT_ARCH=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_64_SMP=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_PGTABLE_LEVELS=4 +CONFIG_CC_HAS_SANE_STACKPROTECTOR=y + +# +# Processor type and features +# +CONFIG_SMP=y +CONFIG_X86_FEATURE_NAMES=y +CONFIG_X86_X2APIC=y +# CONFIG_X86_MPPARSE is not set +# CONFIG_GOLDFISH is not set +# CONFIG_X86_CPU_RESCTRL is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_X86_INTEL_LPSS is not set +# CONFIG_X86_AMD_PLATFORM_DEVICE is not set +# CONFIG_IOSF_MBI is not set +# CONFIG_SCHED_OMIT_FRAME_POINTER is not set +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_PARAVIRT_SPINLOCKS=y +CONFIG_X86_HV_CALLBACK_VECTOR=y +# CONFIG_XEN is not set +# CONFIG_KVM_GUEST is not set +# CONFIG_ARCH_CPUIDLE_HALTPOLL is not set +# CONFIG_PVH is not set +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +# CONFIG_JAILHOUSE_GUEST is not set +# CONFIG_ACRN_GUEST is not set +# CONFIG_MK8 is not set +# CONFIG_MPSC is not set +CONFIG_MCORE2=y +# CONFIG_MATOM is not set +# CONFIG_GENERIC_CPU is not set +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_P6_NOP=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_IA32_FEAT_CTL=y +CONFIG_X86_VMX_FEATURE_NAMES=y +CONFIG_PROCESSOR_SELECT=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +# CONFIG_CPU_SUP_HYGON is not set +CONFIG_CPU_SUP_CENTAUR=y +# CONFIG_CPU_SUP_ZHAOXIN is not set +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +# CONFIG_GART_IOMMU is not set +# CONFIG_MAXSMP is not set +CONFIG_NR_CPUS_RANGE_BEGIN=2 +CONFIG_NR_CPUS_RANGE_END=512 +CONFIG_NR_CPUS_DEFAULT=64 +CONFIG_NR_CPUS=256 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_SCHED_MC_PRIO is not set +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set +# CONFIG_X86_MCE is not set + +# +# Performance monitoring +# +# CONFIG_PERF_EVENTS_INTEL_UNCORE is not set +# CONFIG_PERF_EVENTS_INTEL_RAPL is not set +# CONFIG_PERF_EVENTS_INTEL_CSTATE is not set +# CONFIG_PERF_EVENTS_AMD_POWER is not set +# CONFIG_PERF_EVENTS_AMD_UNCORE is not set +# end of Performance monitoring + +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y +CONFIG_X86_VSYSCALL_EMULATION=y +# CONFIG_X86_IOPL_IOPERM is not set +# CONFIG_MICROCODE is not set +# CONFIG_X86_MSR is not set +# CONFIG_X86_CPUID is not set +# CONFIG_X86_5LEVEL is not set +CONFIG_X86_DIRECT_GBPAGES=y +# CONFIG_X86_CPA_STATISTICS is not set +# CONFIG_AMD_MEM_ENCRYPT is not set +# CONFIG_NUMA is not set +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +# CONFIG_ARCH_MEMORY_PROBE is not set +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_X86_PMEM_LEGACY_DEVICE=y +CONFIG_X86_PMEM_LEGACY=y +# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set +CONFIG_MTRR=y +# CONFIG_MTRR_SANITIZER is not set +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y +CONFIG_X86_UMIP=y +CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +# CONFIG_X86_SGX is not set +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_EFI_MIXED=y +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 +CONFIG_SCHED_HRTICK=y +# CONFIG_KEXEC is not set +# CONFIG_KEXEC_FILE is not set +# CONFIG_CRASH_DUMP is not set +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_DYNAMIC_MEMORY_LAYOUT=y +CONFIG_RANDOMIZE_MEMORY=y +CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa +CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set +# CONFIG_COMPAT_VDSO is not set +# CONFIG_LEGACY_VSYSCALL_EMULATE is not set +# CONFIG_LEGACY_VSYSCALL_XONLY is not set +CONFIG_LEGACY_VSYSCALL_NONE=y +# CONFIG_CMDLINE_BOOL is not set +CONFIG_MODIFY_LDT_SYSCALL=y +CONFIG_HAVE_LIVEPATCH=y +# end of Processor type and features + +CONFIG_CC_HAS_RETURN_THUNK=y +CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_PAGE_TABLE_ISOLATION=y +CONFIG_RETPOLINE=y +CONFIG_RETHUNK=y +CONFIG_CPU_UNRET_ENTRY=y +CONFIG_CPU_IBPB_ENTRY=y +CONFIG_CPU_IBRS_ENTRY=y +CONFIG_ARCH_HAS_ADD_PAGES=y +CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y + +# +# Power management and ACPI options +# +# CONFIG_SUSPEND is not set +# CONFIG_HIBERNATION is not set +# CONFIG_PM is not set +# CONFIG_ENERGY_MODEL is not set +CONFIG_ARCH_SUPPORTS_ACPI=y +CONFIG_ACPI=y +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y +CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y +# CONFIG_ACPI_DEBUGGER is not set +# CONFIG_ACPI_SPCR_TABLE is not set +# CONFIG_ACPI_FPDT is not set +CONFIG_ACPI_LPIT=y +# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set +# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +# CONFIG_ACPI_BUTTON is not set +# CONFIG_ACPI_TINY_POWER_BUTTON is not set +# CONFIG_ACPI_FAN is not set +# CONFIG_ACPI_DOCK is not set +CONFIG_ACPI_CPU_FREQ_PSS=y +CONFIG_ACPI_PROCESSOR_CSTATE=y +CONFIG_ACPI_PROCESSOR_IDLE=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_HOTPLUG_CPU=y +# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set +# CONFIG_ACPI_THERMAL is not set +CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y +# CONFIG_ACPI_TABLE_UPGRADE is not set +# CONFIG_ACPI_DEBUG is not set +# CONFIG_ACPI_PCI_SLOT is not set +CONFIG_ACPI_CONTAINER=y +# CONFIG_ACPI_HOTPLUG_MEMORY is not set +CONFIG_ACPI_HOTPLUG_IOAPIC=y +# CONFIG_ACPI_SBS is not set +# CONFIG_ACPI_HED is not set +# CONFIG_ACPI_CUSTOM_METHOD is not set +# CONFIG_ACPI_BGRT is not set +# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set +CONFIG_ACPI_NFIT=y +# CONFIG_NFIT_SECURITY_DEBUG is not set +CONFIG_HAVE_ACPI_APEI=y +CONFIG_HAVE_ACPI_APEI_NMI=y +# CONFIG_ACPI_APEI is not set +# CONFIG_ACPI_DPTF is not set +# CONFIG_ACPI_CONFIGFS is not set +# CONFIG_PMIC_OPREGION is not set +# CONFIG_X86_PM_TIMER is not set +# CONFIG_ACPI_PRMT is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +# CONFIG_CPU_FREQ_STAT is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set + +# +# CPU frequency scaling drivers +# +# CONFIG_X86_INTEL_PSTATE is not set +# CONFIG_X86_PCC_CPUFREQ is not set +# CONFIG_X86_ACPI_CPUFREQ is not set +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +# CONFIG_X86_P4_CLOCKMOD is not set + +# +# shared options +# +# end of CPU Frequency scaling + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_GOV_LADDER is not set +CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_CPU_IDLE_GOV_TEO is not set +# end of CPU Idle + +# CONFIG_INTEL_IDLE is not set +# end of Power management and ACPI options + +# +# Bus options (PCI etc.) +# +CONFIG_PCI_DIRECT=y +# CONFIG_PCI_MMCONFIG is not set +# CONFIG_PCI_CNB20LE_QUIRK is not set +# CONFIG_ISA_BUS is not set +CONFIG_ISA_DMA_API=y +CONFIG_AMD_NB=y +# end of Bus options (PCI etc.) + +# +# Binary Emulations +# +CONFIG_IA32_EMULATION=y +CONFIG_X86_X32=y +CONFIG_COMPAT_32=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +# end of Binary Emulations + +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_KVM_VFIO=y +CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_KVM_COMPAT=y +CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_HAVE_KVM_NO_POLL=y +CONFIG_KVM_XFER_TO_GUEST_WORK=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=y +CONFIG_KVM_WERROR=y +CONFIG_KVM_INTEL=y +CONFIG_KVM_AMD=y +# CONFIG_KVM_XEN is not set +# CONFIG_KVM_MMU_AUDIT is not set +CONFIG_AS_AVX512=y +CONFIG_AS_SHA1_NI=y +CONFIG_AS_SHA256_NI=y +CONFIG_AS_TPAUSE=y + +# +# General architecture-dependent options +# +CONFIG_CRASH_CORE=y +CONFIG_HOTPLUG_SMT=y +CONFIG_GENERIC_ENTRY=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +# CONFIG_STATIC_KEYS_SELFTEST is not set +# CONFIG_STATIC_CALL_SELFTEST is not set +CONFIG_OPTPROBES=y +CONFIG_KPROBES_ON_FTRACE=y +CONFIG_UPROBES=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y +CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y +CONFIG_HAVE_NMI=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_ARCH_WANTS_NO_INSTR=y +CONFIG_HAVE_ASM_MODVERSIONS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y +CONFIG_MMU_GATHER_TABLE_FREE=y +CONFIG_MMU_GATHER_RCU_TABLE_FREE=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_HAVE_ARCH_SECCOMP=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP=y +CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_CACHE_DEBUG is not set +CONFIG_HAVE_ARCH_STACKLEAK=y +CONFIG_HAVE_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_ARCH_SUPPORTS_LTO_CLANG=y +CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y +CONFIG_LTO_NONE=y +CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOVE_PUD=y +CONFIG_HAVE_MOVE_PMD=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_HAVE_ARCH_SOFT_DIRTY=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y +CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_HAVE_EXIT_THREAD=y +CONFIG_ARCH_MMAP_RND_BITS=28 +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 +CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y +CONFIG_HAVE_STACK_VALIDATION=y +CONFIG_HAVE_RELIABLE_STACKTRACE=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y +CONFIG_COMPAT_32BIT_TIME=y +CONFIG_HAVE_ARCH_VMAP_STACK=y +CONFIG_VMAP_STACK=y +CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y +# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_STRICT_MODULE_RWX=y +CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y +# CONFIG_LOCK_EVENT_COUNTS is not set +CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_HAVE_STATIC_CALL=y +CONFIG_HAVE_STATIC_CALL_INLINE=y +CONFIG_HAVE_PREEMPT_DYNAMIC=y +CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_HAS_ELFCORE_COMPAT=y +CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +# end of GCOV-based kernel profiling + +CONFIG_HAVE_GCC_PLUGINS=y +# end of General architecture-dependent options + +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_ASM_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_COMPRESS_NONE=y +# CONFIG_MODULE_COMPRESS_GZIP is not set +# CONFIG_MODULE_COMPRESS_XZ is not set +# CONFIG_MODULE_COMPRESS_ZSTD is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +CONFIG_MODPROBE_PATH="/sbin/modprobe" +# CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_DEV_BSG_COMMON=y +CONFIG_BLK_DEV_BSGLIB=y +# CONFIG_BLK_DEV_INTEGRITY is not set +# CONFIG_BLK_DEV_ZONED is not set +# CONFIG_BLK_DEV_THROTTLING is not set +# CONFIG_BLK_WBT is not set +# CONFIG_BLK_CGROUP_IOLATENCY is not set +# CONFIG_BLK_CGROUP_IOCOST is not set +# CONFIG_BLK_CGROUP_IOPRIO is not set +# CONFIG_BLK_DEBUG_FS is not set +# CONFIG_BLK_SED_OPAL is not set +# CONFIG_BLK_INLINE_ENCRYPTION is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_AIX_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +# CONFIG_CMDLINE_PARTITION is not set +# end of Partition Types + +CONFIG_BLOCK_COMPAT=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLOCK_HOLDER_DEPRECATED=y + +# +# IO Schedulers +# +# CONFIG_MQ_IOSCHED_DEADLINE is not set +# CONFIG_MQ_IOSCHED_KYBER is not set +# CONFIG_IOSCHED_BFQ is not set +# end of IO Schedulers + +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=y +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_QUEUED_SPINLOCKS=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_QUEUED_RWLOCKS=y +CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y +CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y +CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y +CONFIG_FREEZER=y + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y +# end of Executable file formats + +# +# Memory Management options +# +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_FAST_GUP=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_HAVE_BOOTMEM_INFO_NODE=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_SPARSE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_MEMORY_HOTREMOVE=y +CONFIG_MHP_MEMMAP_ON_MEMORY=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_MEMORY_BALLOON=y +# CONFIG_BALLOON_COMPACTION is not set +CONFIG_COMPACTION=y +CONFIG_PAGE_REPORTING=y +CONFIG_MIGRATION=y +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y +CONFIG_ARCH_ENABLE_THP_MIGRATION=y +CONFIG_CONTIG_ALLOC=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_ARCH_WANTS_THP_SWAP=y +CONFIG_THP_SWAP=y +# CONFIG_CLEANCACHE is not set +# CONFIG_FRONTSWAP is not set +# CONFIG_CMA is not set +# CONFIG_MEM_SOFT_DIRTY is not set +# CONFIG_ZPOOL is not set +# CONFIG_ZSMALLOC is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_DEFERRED_STRUCT_PAGE_INIT=y +# CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_PTE_DEVMAP=y +CONFIG_ARCH_HAS_ZONE_DMA_SET=y +CONFIG_ZONE_DMA=y +CONFIG_ZONE_DMA32=y +CONFIG_ZONE_DEVICE=y +CONFIG_DEV_PAGEMAP_OPS=y +# CONFIG_DEVICE_PRIVATE is not set +CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y +CONFIG_ARCH_HAS_PKEYS=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_TEST is not set +# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_SECRETMEM=y + +# +# Data Access Monitoring +# +# CONFIG_DAMON is not set +# end of Data Access Monitoring +# end of Memory Management options + +CONFIG_NET=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y +CONFIG_SKB_EXTENSIONS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=y +CONFIG_UNIX=y +CONFIG_UNIX_SCM=y +CONFIG_AF_UNIX_OOB=y +CONFIG_UNIX_DIAG=y +# CONFIG_TLS is not set +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_USER_COMPAT is not set +# CONFIG_XFRM_INTERFACE is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_ESP=y +# CONFIG_NET_KEY is not set +# CONFIG_XDP_SOCKETS is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +CONFIG_IP_ADVANCED_ROUTER=y +# CONFIG_IP_FIB_TRIE_STATS is not set +CONFIG_IP_MULTIPLE_TABLES=y +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +CONFIG_NET_IPIP=y +# CONFIG_NET_IPGRE_DEMUX is not set +CONFIG_NET_IP_TUNNEL=y +CONFIG_SYN_COOKIES=y +# CONFIG_NET_IPVTI is not set +CONFIG_NET_UDP_TUNNEL=y +# CONFIG_NET_FOU is not set +# CONFIG_NET_FOU_IP_TUNNELS is not set +# CONFIG_INET_AH is not set +CONFIG_INET_ESP=y +# CONFIG_INET_ESP_OFFLOAD is not set +# CONFIG_INET_ESPINTCP is not set +# CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 +CONFIG_INET_TUNNEL=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=y +CONFIG_INET_RAW_DIAG=y +# CONFIG_INET_DIAG_DESTROY is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +# CONFIG_IPV6_ROUTER_PREF is not set +CONFIG_IPV6_OPTIMISTIC_DAD=y +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_IPV6_ILA is not set +# CONFIG_IPV6_VTI is not set +CONFIG_IPV6_SIT=y +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6_SEG6_LWTUNNEL is not set +# CONFIG_IPV6_SEG6_HMAC is not set +# CONFIG_IPV6_RPL_LWTUNNEL is not set +# CONFIG_IPV6_IOAM6_LWTUNNEL is not set +# CONFIG_NETLABEL is not set +# CONFIG_MPTCP is not set +CONFIG_NETWORK_SECMARK=y +CONFIG_NET_PTP_CLASSIFY=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=y +CONFIG_NETFILTER_FAMILY_BRIDGE=y +CONFIG_NETFILTER_FAMILY_ARP=y +# CONFIG_NETFILTER_NETLINK_HOOK is not set +# CONFIG_NETFILTER_NETLINK_ACCT is not set +CONFIG_NETFILTER_NETLINK_QUEUE=y +CONFIG_NETFILTER_NETLINK_LOG=y +# CONFIG_NETFILTER_NETLINK_OSF is not set +CONFIG_NF_CONNTRACK=y +CONFIG_NF_LOG_SYSLOG=y +CONFIG_NETFILTER_CONNCOUNT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_SECMARK is not set +# CONFIG_NF_CONNTRACK_ZONES is not set +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_EVENTS=y +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set +# CONFIG_NF_CONNTRACK_LABELS is not set +# CONFIG_NF_CT_PROTO_DCCP is not set +CONFIG_NF_CT_PROTO_GRE=y +# CONFIG_NF_CT_PROTO_SCTP is not set +# CONFIG_NF_CT_PROTO_UDPLITE is not set +CONFIG_NF_CONNTRACK_AMANDA=y +CONFIG_NF_CONNTRACK_FTP=y +CONFIG_NF_CONNTRACK_H323=y +CONFIG_NF_CONNTRACK_IRC=y +CONFIG_NF_CONNTRACK_BROADCAST=y +CONFIG_NF_CONNTRACK_NETBIOS_NS=y +# CONFIG_NF_CONNTRACK_SNMP is not set +CONFIG_NF_CONNTRACK_PPTP=y +CONFIG_NF_CONNTRACK_SANE=y +CONFIG_NF_CONNTRACK_SIP=y +CONFIG_NF_CONNTRACK_TFTP=y +CONFIG_NF_CT_NETLINK=y +# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +CONFIG_NF_NAT=y +CONFIG_NF_NAT_AMANDA=y +CONFIG_NF_NAT_FTP=y +CONFIG_NF_NAT_IRC=y +CONFIG_NF_NAT_SIP=y +CONFIG_NF_NAT_TFTP=y +CONFIG_NF_NAT_REDIRECT=y +CONFIG_NF_NAT_MASQUERADE=y +CONFIG_NETFILTER_SYNPROXY=y +CONFIG_NF_TABLES=y +CONFIG_NF_TABLES_INET=y +# CONFIG_NF_TABLES_NETDEV is not set +CONFIG_NFT_NUMGEN=y +CONFIG_NFT_CT=y +CONFIG_NFT_COUNTER=y +CONFIG_NFT_CONNLIMIT=y +CONFIG_NFT_LOG=y +CONFIG_NFT_LIMIT=y +CONFIG_NFT_MASQ=y +CONFIG_NFT_REDIR=y +CONFIG_NFT_NAT=y +CONFIG_NFT_TUNNEL=y +CONFIG_NFT_OBJREF=y +# CONFIG_NFT_QUEUE is not set +# CONFIG_NFT_QUOTA is not set +CONFIG_NFT_REJECT=y +CONFIG_NFT_REJECT_INET=y +CONFIG_NFT_COMPAT=y +# CONFIG_NFT_HASH is not set +CONFIG_NFT_XFRM=y +CONFIG_NFT_SOCKET=y +# CONFIG_NFT_OSF is not set +# CONFIG_NFT_TPROXY is not set +# CONFIG_NFT_SYNPROXY is not set +# CONFIG_NF_FLOW_TABLE is not set +CONFIG_NETFILTER_XTABLES=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=y +# CONFIG_NETFILTER_XT_CONNMARK is not set +CONFIG_NETFILTER_XT_SET=y + +# +# Xtables targets +# +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_CT is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_HL=y +# CONFIG_NETFILTER_XT_TARGET_HMARK is not set +# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set +CONFIG_NETFILTER_XT_TARGET_LOG=y +CONFIG_NETFILTER_XT_TARGET_MARK=y +CONFIG_NETFILTER_XT_NAT=y +CONFIG_NETFILTER_XT_TARGET_NETMAP=y +CONFIG_NETFILTER_XT_TARGET_NFLOG=y +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +CONFIG_NETFILTER_XT_TARGET_REDIRECT=y +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y +# CONFIG_NETFILTER_XT_TARGET_TEE is not set +# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +CONFIG_NETFILTER_XT_TARGET_SECMARK=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y +# CONFIG_NETFILTER_XT_MATCH_BPF is not set +CONFIG_NETFILTER_XT_MATCH_CGROUP=y +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +CONFIG_NETFILTER_XT_MATCH_COMMENT=y +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +# CONFIG_NETFILTER_XT_MATCH_CPU is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +CONFIG_NETFILTER_XT_MATCH_ECN=y +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +CONFIG_NETFILTER_XT_MATCH_HL=y +# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set +# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +CONFIG_NETFILTER_XT_MATCH_IPVS=y +# CONFIG_NETFILTER_XT_MATCH_L2TP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +CONFIG_NETFILTER_XT_MATCH_LIMIT=y +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y +# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set +# CONFIG_NETFILTER_XT_MATCH_OSF is not set +CONFIG_NETFILTER_XT_MATCH_OWNER=y +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set +CONFIG_NETFILTER_XT_MATCH_STATISTIC=y +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# end of Core Netfilter Configuration + +CONFIG_IP_SET=y +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=y +CONFIG_IP_SET_BITMAP_IPMAC=y +CONFIG_IP_SET_BITMAP_PORT=y +CONFIG_IP_SET_HASH_IP=y +CONFIG_IP_SET_HASH_IPMARK=y +CONFIG_IP_SET_HASH_IPPORT=y +CONFIG_IP_SET_HASH_IPPORTIP=y +CONFIG_IP_SET_HASH_IPPORTNET=y +CONFIG_IP_SET_HASH_IPMAC=y +CONFIG_IP_SET_HASH_MAC=y +CONFIG_IP_SET_HASH_NETPORTNET=y +CONFIG_IP_SET_HASH_NET=y +CONFIG_IP_SET_HASH_NETNET=y +CONFIG_IP_SET_HASH_NETPORT=y +CONFIG_IP_SET_HASH_NETIFACE=y +# CONFIG_IP_SET_LIST_SET is not set +CONFIG_IP_VS=y +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +# CONFIG_IP_VS_PROTO_ESP is not set +# CONFIG_IP_VS_PROTO_AH is not set +# CONFIG_IP_VS_PROTO_SCTP is not set + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=y +CONFIG_IP_VS_WRR=y +# CONFIG_IP_VS_LC is not set +# CONFIG_IP_VS_WLC is not set +# CONFIG_IP_VS_FO is not set +# CONFIG_IP_VS_OVF is not set +# CONFIG_IP_VS_LBLC is not set +# CONFIG_IP_VS_LBLCR is not set +# CONFIG_IP_VS_DH is not set +CONFIG_IP_VS_SH=y +# CONFIG_IP_VS_MH is not set +# CONFIG_IP_VS_SED is not set +# CONFIG_IP_VS_NQ is not set +# CONFIG_IP_VS_TWOS is not set + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS MH scheduler +# +CONFIG_IP_VS_MH_TAB_INDEX=12 + +# +# IPVS application helper +# +# CONFIG_IP_VS_FTP is not set +CONFIG_IP_VS_NFCT=y +# CONFIG_IP_VS_PE_SIP is not set + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=y +CONFIG_NF_SOCKET_IPV4=y +# CONFIG_NF_TPROXY_IPV4 is not set +CONFIG_NF_TABLES_IPV4=y +CONFIG_NFT_REJECT_IPV4=y +# CONFIG_NFT_DUP_IPV4 is not set +# CONFIG_NFT_FIB_IPV4 is not set +# CONFIG_NF_TABLES_ARP is not set +# CONFIG_NF_DUP_IPV4 is not set +# CONFIG_NF_LOG_ARP is not set +CONFIG_NF_LOG_IPV4=y +CONFIG_NF_REJECT_IPV4=y +CONFIG_NF_NAT_PPTP=y +CONFIG_NF_NAT_H323=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MATCH_AH=y +CONFIG_IP_NF_MATCH_ECN=y +CONFIG_IP_NF_MATCH_RPFILTER=y +CONFIG_IP_NF_MATCH_TTL=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_SYNPROXY=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_NETMAP=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_MANGLE=y +CONFIG_IP_NF_TARGET_CLUSTERIP=y +CONFIG_IP_NF_TARGET_ECN=y +CONFIG_IP_NF_TARGET_TTL=y +CONFIG_IP_NF_RAW=y +CONFIG_IP_NF_SECURITY=y +CONFIG_IP_NF_ARPTABLES=y +CONFIG_IP_NF_ARPFILTER=y +CONFIG_IP_NF_ARP_MANGLE=y +# end of IP: Netfilter Configuration + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_SOCKET_IPV6=y +# CONFIG_NF_TPROXY_IPV6 is not set +CONFIG_NF_TABLES_IPV6=y +CONFIG_NFT_REJECT_IPV6=y +# CONFIG_NFT_DUP_IPV6 is not set +# CONFIG_NFT_FIB_IPV6 is not set +# CONFIG_NF_DUP_IPV6 is not set +CONFIG_NF_REJECT_IPV6=y +CONFIG_NF_LOG_IPV6=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_MATCH_AH=y +CONFIG_IP6_NF_MATCH_EUI64=y +CONFIG_IP6_NF_MATCH_FRAG=y +CONFIG_IP6_NF_MATCH_OPTS=y +CONFIG_IP6_NF_MATCH_HL=y +CONFIG_IP6_NF_MATCH_IPV6HEADER=y +CONFIG_IP6_NF_MATCH_MH=y +CONFIG_IP6_NF_MATCH_RPFILTER=y +CONFIG_IP6_NF_MATCH_RT=y +CONFIG_IP6_NF_MATCH_SRH=y +CONFIG_IP6_NF_TARGET_HL=y +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_REJECT=y +CONFIG_IP6_NF_TARGET_SYNPROXY=y +CONFIG_IP6_NF_MANGLE=y +CONFIG_IP6_NF_RAW=y +CONFIG_IP6_NF_SECURITY=y +CONFIG_IP6_NF_NAT=y +CONFIG_IP6_NF_TARGET_MASQUERADE=y +CONFIG_IP6_NF_TARGET_NPT=y +# end of IPv6: Netfilter Configuration + +CONFIG_NF_DEFRAG_IPV6=y +# CONFIG_NF_TABLES_BRIDGE is not set +# CONFIG_NF_CONNTRACK_BRIDGE is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set +# CONFIG_BPFILTER is not set +# CONFIG_IP_DCCP is not set +CONFIG_IP_SCTP=y +# CONFIG_SCTP_DBG_OBJCNT is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +# CONFIG_SCTP_COOKIE_HMAC_SHA1 is not set +CONFIG_INET_SCTP_DIAG=y +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_L2TP is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +# CONFIG_BRIDGE_MRP is not set +# CONFIG_BRIDGE_CFM is not set +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=y +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_VLAN_8021Q_MVRP is not set +# CONFIG_DECNET is not set +CONFIG_LLC=y +# CONFIG_LLC2 is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_PHONET is not set +# CONFIG_6LOWPAN is not set +# CONFIG_IEEE802154 is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +CONFIG_NET_SCH_MULTIQ=y +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_CBS is not set +# CONFIG_NET_SCH_ETF is not set +# CONFIG_NET_SCH_TAPRIO is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +# CONFIG_NET_SCH_NETEM is not set +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_SKBPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set +# CONFIG_NET_SCH_CODEL is not set +CONFIG_NET_SCH_FQ_CODEL=y +# CONFIG_NET_SCH_CAKE is not set +# CONFIG_NET_SCH_FQ is not set +# CONFIG_NET_SCH_HHF is not set +# CONFIG_NET_SCH_PIE is not set +CONFIG_NET_SCH_INGRESS=y +# CONFIG_NET_SCH_PLUG is not set +# CONFIG_NET_SCH_ETS is not set +CONFIG_NET_SCH_DEFAULT=y +CONFIG_DEFAULT_FQ_CODEL=y +# CONFIG_DEFAULT_PFIFO_FAST is not set +CONFIG_DEFAULT_NET_SCH="fq_codel" + +# +# Classification +# +CONFIG_NET_CLS=y +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +CONFIG_NET_CLS_U32=y +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +CONFIG_NET_CLS_CGROUP=y +CONFIG_NET_CLS_BPF=y +CONFIG_NET_CLS_FLOWER=y +# CONFIG_NET_CLS_MATCHALL is not set +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +# CONFIG_NET_ACT_POLICE is not set +# CONFIG_NET_ACT_GACT is not set +CONFIG_NET_ACT_MIRRED=y +# CONFIG_NET_ACT_SAMPLE is not set +CONFIG_NET_ACT_IPT=y +# CONFIG_NET_ACT_NAT is not set +# CONFIG_NET_ACT_PEDIT is not set +# CONFIG_NET_ACT_SIMP is not set +# CONFIG_NET_ACT_SKBEDIT is not set +# CONFIG_NET_ACT_CSUM is not set +# CONFIG_NET_ACT_MPLS is not set +# CONFIG_NET_ACT_VLAN is not set +CONFIG_NET_ACT_BPF=y +# CONFIG_NET_ACT_CONNMARK is not set +# CONFIG_NET_ACT_CTINFO is not set +# CONFIG_NET_ACT_SKBMOD is not set +# CONFIG_NET_ACT_IFE is not set +# CONFIG_NET_ACT_TUNNEL_KEY is not set +# CONFIG_NET_ACT_GATE is not set +# CONFIG_NET_TC_SKB_EXT is not set +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +# CONFIG_BATMAN_ADV is not set +# CONFIG_OPENVSWITCH is not set +CONFIG_VSOCKETS=y +CONFIG_VSOCKETS_DIAG=y +# CONFIG_VSOCKETS_LOOPBACK is not set +# CONFIG_VIRTIO_VSOCKETS is not set +CONFIG_HYPERV_VSOCKETS=y +CONFIG_NETLINK_DIAG=y +# CONFIG_MPLS is not set +# CONFIG_NET_NSH is not set +# CONFIG_HSR is not set +CONFIG_NET_SWITCHDEV=y +CONFIG_NET_L3_MASTER_DEV=y +# CONFIG_QRTR is not set +# CONFIG_NET_NCSI is not set +# CONFIG_PCPU_DEV_REFCNT is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_SOCK_RX_QUEUE_MAPPING=y +CONFIG_XPS=y +CONFIG_CGROUP_NET_PRIO=y +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +# CONFIG_BPF_STREAM_PARSER is not set +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_NET_DROP_MONITOR=y +# end of Network testing +# end of Networking options + +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_AF_KCM is not set +# CONFIG_MCTP is not set +CONFIG_FIB_RULES=y +# CONFIG_WIRELESS is not set +# CONFIG_RFKILL is not set +CONFIG_NET_9P=y +CONFIG_NET_9P_VIRTIO=y +# CONFIG_NET_9P_DEBUG is not set +# CONFIG_CAIF is not set +CONFIG_CEPH_LIB=y +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +# CONFIG_NFC is not set +# CONFIG_PSAMPLE is not set +# CONFIG_NET_IFE is not set +# CONFIG_LWTUNNEL is not set +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_NET_SOCK_MSG=y +CONFIG_FAILOVER=y +# CONFIG_ETHTOOL_NETLINK is not set + +# +# Device Drivers +# +CONFIG_HAVE_EISA=y +# CONFIG_EISA is not set +CONFIG_HAVE_PCI=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCIEAER=y +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_ECRC is not set +CONFIG_PCIEASPM=y +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +# CONFIG_PCIE_DPC is not set +# CONFIG_PCIE_PTM is not set +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PCI_QUIRKS=y +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_PF_STUB is not set +CONFIG_PCI_ATS=y +CONFIG_PCI_LOCKLESS_CONFIG=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +# CONFIG_PCI_P2PDMA is not set +CONFIG_PCI_LABEL=y +CONFIG_PCI_HYPERV=y +# CONFIG_PCIE_BUS_TUNE_OFF is not set +CONFIG_PCIE_BUS_DEFAULT=y +# CONFIG_PCIE_BUS_SAFE is not set +# CONFIG_PCIE_BUS_PERFORMANCE is not set +# CONFIG_PCIE_BUS_PEER2PEER is not set +# CONFIG_HOTPLUG_PCI is not set + +# +# PCI controller drivers +# +# CONFIG_VMD is not set +CONFIG_PCI_HYPERV_INTERFACE=y + +# +# DesignWare PCI Core Support +# +# CONFIG_PCIE_DW_PLAT_HOST is not set +# CONFIG_PCI_MESON is not set +# end of DesignWare PCI Core Support + +# +# Mobiveil PCIe Core Support +# +# end of Mobiveil PCIe Core Support + +# +# Cadence PCIe controllers support +# +# end of Cadence PCIe controllers support +# end of PCI controller drivers + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set +# end of PCI Endpoint + +# +# PCI switch controller drivers +# +# CONFIG_PCI_SW_SWITCHTEC is not set +# end of PCI switch controller drivers + +# CONFIG_CXL_BUS is not set +# CONFIG_PCCARD is not set +# CONFIG_RAPIDIO is not set + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER=y +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y + +# +# Firmware loader +# +CONFIG_FW_LOADER=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER is not set +# CONFIG_FW_LOADER_COMPRESS is not set +# end of Firmware loader + +CONFIG_ALLOW_DEV_COREDUMP=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +# end of Generic Driver Options + +# +# Bus devices +# +# CONFIG_MHI_BUS is not set +# end of Bus devices + +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y + +# +# Firmware Drivers +# + +# +# ARM System Control and Management Interface Protocol +# +# end of ARM System Control and Management Interface Protocol + +# CONFIG_EDD is not set +CONFIG_FIRMWARE_MEMMAP=y +# CONFIG_DMIID is not set +# CONFIG_DMI_SYSFS is not set +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y +# CONFIG_ISCSI_IBFT is not set +# CONFIG_FW_CFG_SYSFS is not set +CONFIG_SYSFB=y +# CONFIG_SYSFB_SIMPLEFB is not set +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +# CONFIG_EFI_VARS is not set +CONFIG_EFI_ESRT=y +# CONFIG_EFI_FAKE_MEMMAP is not set +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y +# CONFIG_EFI_BOOTLOADER_CONTROL is not set +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +# CONFIG_APPLE_PROPERTIES is not set +CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_EFI_RCI2_TABLE is not set +# CONFIG_EFI_DISABLE_PCI_DMA is not set +# end of EFI (Extensible Firmware Interface) Support + +CONFIG_EFI_EARLYCON=y +# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set + +# +# Tegra firmware driver +# +# end of Tegra firmware driver +# end of Firmware Drivers + +# CONFIG_GNSS is not set +# CONFIG_MTD is not set +# CONFIG_OF is not set +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +# CONFIG_PARPORT is not set +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_NULL_BLK is not set +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_DRBD is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SX8 is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=65536 +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_VIRTIO_BLK=y +# CONFIG_BLK_DEV_RBD is not set +# CONFIG_BLK_DEV_RSXX is not set + +# +# NVME Support +# +# CONFIG_BLK_DEV_NVME is not set +# CONFIG_NVME_FC is not set +# CONFIG_NVME_TCP is not set +# end of NVME Support + +# +# Misc devices +# +# CONFIG_AD525X_DPOT is not set +# CONFIG_DUMMY_IRQ is not set +# CONFIG_IBM_ASM is not set +# CONFIG_PHANTOM is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_SRAM is not set +# CONFIG_DW_XDATA_PCIE is not set +# CONFIG_PCI_ENDPOINT_TEST is not set +# CONFIG_XILINX_SDFEC is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_EEPROM_IDT_89HPESX is not set +# CONFIG_EEPROM_EE1004 is not set +# end of EEPROM support + +# CONFIG_CB710_CORE is not set + +# +# Texas Instruments shared transport line discipline +# +# end of Texas Instruments shared transport line discipline + +# CONFIG_SENSORS_LIS3_I2C is not set +# CONFIG_ALTERA_STAPL is not set +# CONFIG_INTEL_MEI is not set +# CONFIG_INTEL_MEI_ME is not set +# CONFIG_INTEL_MEI_TXE is not set +# CONFIG_VMWARE_VMCI is not set +# CONFIG_GENWQE is not set +# CONFIG_ECHO is not set +# CONFIG_BCM_VK is not set +# CONFIG_MISC_ALCOR_PCI is not set +# CONFIG_MISC_RTSX_PCI is not set +# CONFIG_MISC_RTSX_USB is not set +# CONFIG_HABANA_AI is not set +# CONFIG_UACCE is not set +# CONFIG_PVPANIC is not set +# end of Misc devices + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI_COMMON=y +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_BLK_DEV_SR is not set +CONFIG_CHR_DEV_SG=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +CONFIG_SCSI_SCAN_ASYNC=y + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +# end of SCSI Transports + +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_ISCSI_BOOT_SYSFS is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_SCSI_ESAS2R is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_MPI3MR is not set +# CONFIG_SCSI_SMARTPQI is not set +# CONFIG_SCSI_UFSHCD is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_MYRB is not set +# CONFIG_SCSI_MYRS is not set +# CONFIG_VMWARE_PVSCSI is not set +CONFIG_HYPERV_STORAGE=y +# CONFIG_SCSI_SNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_FDOMAIN_PCI is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_WD719X is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +CONFIG_SCSI_VIRTIO=y +# CONFIG_SCSI_DH is not set +# end of SCSI device support + +# CONFIG_ATA is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +# CONFIG_MD_AUTODETECT is not set +# CONFIG_MD_LINEAR is not set +CONFIG_MD_RAID0=y +CONFIG_MD_RAID1=y +CONFIG_MD_RAID10=y +CONFIG_MD_RAID456=y +# CONFIG_MD_MULTIPATH is not set +# CONFIG_MD_FAULTY is not set +# CONFIG_BCACHE is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=y +# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set +CONFIG_DM_BIO_PRISON=y +CONFIG_DM_PERSISTENT_DATA=y +# CONFIG_DM_UNSTRIPED is not set +CONFIG_DM_CRYPT=y +# CONFIG_DM_SNAPSHOT is not set +CONFIG_DM_THIN_PROVISIONING=y +# CONFIG_DM_CACHE is not set +# CONFIG_DM_WRITECACHE is not set +# CONFIG_DM_EBS is not set +# CONFIG_DM_ERA is not set +# CONFIG_DM_CLONE is not set +# CONFIG_DM_MIRROR is not set +CONFIG_DM_RAID=y +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_DUST is not set +# CONFIG_DM_INIT is not set +# CONFIG_DM_UEVENT is not set +# CONFIG_DM_FLAKEY is not set +CONFIG_DM_VERITY=y +CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y +# CONFIG_DM_VERITY_FEC is not set +# CONFIG_DM_SWITCH is not set +# CONFIG_DM_LOG_WRITES is not set +# CONFIG_DM_INTEGRITY is not set +# CONFIG_TARGET_CORE is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_FIREWIRE is not set +# CONFIG_FIREWIRE_NOSY is not set +# end of IEEE 1394 (FireWire) support + +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +CONFIG_MII=y +CONFIG_NET_CORE=y +CONFIG_BONDING=y +CONFIG_DUMMY=y +CONFIG_WIREGUARD=y +# CONFIG_WIREGUARD_DEBUG is not set +# CONFIG_EQUALIZER is not set +# CONFIG_NET_FC is not set +# CONFIG_IFB is not set +CONFIG_NET_TEAM=y +# CONFIG_NET_TEAM_MODE_BROADCAST is not set +# CONFIG_NET_TEAM_MODE_ROUNDROBIN is not set +# CONFIG_NET_TEAM_MODE_RANDOM is not set +# CONFIG_NET_TEAM_MODE_ACTIVEBACKUP is not set +# CONFIG_NET_TEAM_MODE_LOADBALANCE is not set +CONFIG_MACVLAN=y +CONFIG_MACVTAP=y +CONFIG_IPVLAN_L3S=y +CONFIG_IPVLAN=y +CONFIG_IPVTAP=y +CONFIG_VXLAN=y +CONFIG_GENEVE=y +# CONFIG_BAREUDP is not set +# CONFIG_GTP is not set +# CONFIG_MACSEC is not set +# CONFIG_NETCONSOLE is not set +CONFIG_TUN=y +CONFIG_TAP=y +# CONFIG_TUN_VNET_CROSS_LE is not set +CONFIG_VETH=y +CONFIG_VIRTIO_NET=y +# CONFIG_NLMON is not set +# CONFIG_ARCNET is not set +CONFIG_ETHERNET=y +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_ADAPTEC is not set +# CONFIG_NET_VENDOR_AGERE is not set +# CONFIG_NET_VENDOR_ALACRITECH is not set +# CONFIG_NET_VENDOR_ALTEON is not set +# CONFIG_ALTERA_TSE is not set +# CONFIG_NET_VENDOR_AMAZON is not set +# CONFIG_NET_VENDOR_AMD is not set +# CONFIG_NET_VENDOR_AQUANTIA is not set +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_VENDOR_ATHEROS is not set +# CONFIG_CX_ECAT is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CADENCE is not set +# CONFIG_NET_VENDOR_CAVIUM is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +# CONFIG_NET_VENDOR_CISCO is not set +# CONFIG_NET_VENDOR_CORTINA is not set +# CONFIG_DNET is not set +# CONFIG_NET_VENDOR_DEC is not set +# CONFIG_NET_VENDOR_DLINK is not set +# CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_EZCHIP is not set +# CONFIG_NET_VENDOR_GOOGLE is not set +# CONFIG_NET_VENDOR_HUAWEI is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_JME is not set +# CONFIG_NET_VENDOR_LITEX is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_NET_VENDOR_MICROSEMI is not set +# CONFIG_NET_VENDOR_MICROSOFT is not set +# CONFIG_NET_VENDOR_MYRI is not set +# CONFIG_FEALNX is not set +# CONFIG_NET_VENDOR_NI is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NETERION is not set +# CONFIG_NET_VENDOR_NETRONOME is not set +# CONFIG_NET_VENDOR_NVIDIA is not set +# CONFIG_NET_VENDOR_OKI is not set +# CONFIG_ETHOC is not set +# CONFIG_NET_VENDOR_PACKET_ENGINES is not set +# CONFIG_NET_VENDOR_PENSANDO is not set +# CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_BROCADE is not set +# CONFIG_NET_VENDOR_QUALCOMM is not set +# CONFIG_NET_VENDOR_RDC is not set +# CONFIG_NET_VENDOR_REALTEK is not set +# CONFIG_NET_VENDOR_RENESAS is not set +# CONFIG_NET_VENDOR_ROCKER is not set +# CONFIG_NET_VENDOR_SAMSUNG is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SILAN is not set +# CONFIG_NET_VENDOR_SIS is not set +# CONFIG_NET_VENDOR_SOLARFLARE is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_SOCIONEXT is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_SUN is not set +# CONFIG_NET_VENDOR_SYNOPSYS is not set +# CONFIG_NET_VENDOR_TEHUTI is not set +# CONFIG_NET_VENDOR_TI is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +# CONFIG_NET_VENDOR_XILINX is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_NET_SB1000 is not set +# CONFIG_PHYLIB is not set +# CONFIG_MDIO_DEVICE is not set + +# +# PCS device drivers +# +# end of PCS device drivers + +CONFIG_PPP=y +CONFIG_PPP_BSDCOMP=y +CONFIG_PPP_DEFLATE=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=y +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOE=y +CONFIG_PPP_ASYNC=y +CONFIG_PPP_SYNC_TTY=y +# CONFIG_SLIP is not set +CONFIG_SLHC=y +CONFIG_USB_NET_DRIVERS=y +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_RTL8152 is not set +# CONFIG_USB_LAN78XX is not set +CONFIG_USB_USBNET=y +# CONFIG_USB_NET_AX8817X is not set +# CONFIG_USB_NET_AX88179_178A is not set +CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_CDC_EEM is not set +CONFIG_USB_NET_CDC_NCM=y +# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set +# CONFIG_USB_NET_CDC_MBIM is not set +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_SR9700 is not set +# CONFIG_USB_NET_SR9800 is not set +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set +# CONFIG_USB_NET_KALMIA is not set +# CONFIG_USB_NET_QMI_WWAN is not set +# CONFIG_USB_NET_INT51X1 is not set +# CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set +# CONFIG_USB_VL600 is not set +# CONFIG_USB_NET_CH9200 is not set +# CONFIG_USB_NET_AQC111 is not set +CONFIG_USB_RTL8153_ECM=y +# CONFIG_WLAN is not set +# CONFIG_WAN is not set + +# +# Wireless WAN +# +# CONFIG_WWAN is not set +# end of Wireless WAN + +# CONFIG_VMXNET3 is not set +# CONFIG_FUJITSU_ES is not set +CONFIG_HYPERV_NET=y +# CONFIG_NETDEVSIM is not set +CONFIG_NET_FAILOVER=y +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_SPARSEKMAP is not set +# CONFIG_INPUT_MATRIXKMAP is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set +# CONFIG_RMI4_CORE is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +# CONFIG_SERIO_I8042 is not set +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_PCIPS2 is not set +# CONFIG_SERIO_LIBPS2 is not set +CONFIG_SERIO_RAW=y +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_SERIO_PS2MULT is not set +# CONFIG_SERIO_ARC_PS2 is not set +CONFIG_HYPERV_KEYBOARD=y +# CONFIG_USERIO is not set +# CONFIG_GAMEPORT is not set +# end of Hardware I/O ports +# end of Input device support + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_LDISC_AUTOLOAD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y +CONFIG_SERIAL_8250_PNP=y +# CONFIG_SERIAL_8250_16550A_VARIANTS is not set +# CONFIG_SERIAL_8250_FINTEK is not set +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +# CONFIG_SERIAL_8250_EXAR is not set +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_DW is not set +# CONFIG_SERIAL_8250_RT288X is not set +# CONFIG_SERIAL_8250_LPSS is not set +# CONFIG_SERIAL_8250_MID is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_LANTIQ is not set +# CONFIG_SERIAL_SCCNXP is not set +# CONFIG_SERIAL_SC16IS7XX is not set +# CONFIG_SERIAL_BCM63XX is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_ARC is not set +# CONFIG_SERIAL_RP2 is not set +# CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_FSL_LINFLEXUART is not set +# CONFIG_SERIAL_SPRD is not set +# end of Serial drivers + +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_N_GSM is not set +# CONFIG_NOZOMI is not set +# CONFIG_NULL_TTY is not set +CONFIG_HVC_DRIVER=y +# CONFIG_SERIAL_DEV_BUS is not set +# CONFIG_TTY_PRINTK is not set +CONFIG_VIRTIO_CONSOLE=y +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_APPLICOM is not set +# CONFIG_MWAVE is not set +CONFIG_DEVMEM=y +CONFIG_NVRAM=y +# CONFIG_DEVPORT is not set +# CONFIG_HPET is not set +# CONFIG_HANGCHECK_TIMER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set +# CONFIG_XILLYBUS is not set +# CONFIG_XILLYUSB is not set +CONFIG_RANDOM_TRUST_CPU=y +# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +# end of Character devices + +# +# I2C support +# +CONFIG_I2C=y +# CONFIG_ACPI_I2C_OPREGION is not set +CONFIG_I2C_BOARDINFO=y +# CONFIG_I2C_COMPAT is not set +# CONFIG_I2C_CHARDEV is not set +# CONFIG_I2C_MUX is not set +# CONFIG_I2C_HELPER_AUTO is not set +# CONFIG_I2C_SMBUS is not set + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=y +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set +# end of I2C Algorithms + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_AMD_MP2 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_ISMT is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_NVIDIA_GPU is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# ACPI drivers +# +# CONFIG_I2C_SCMI is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set +# CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EMEV2 is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_DIOLAN_U2C is not set +# CONFIG_I2C_CP2615 is not set +# CONFIG_I2C_ROBOTFUZZ_OSIF is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_MLXCPLD is not set +# CONFIG_I2C_VIRTIO is not set +# end of I2C Hardware Bus support + +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_SLAVE is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# end of I2C support + +# CONFIG_I3C is not set +# CONFIG_SPI is not set +# CONFIG_SPMI is not set +# CONFIG_HSI is not set +CONFIG_PPS=y +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +# CONFIG_PPS_CLIENT_LDISC is not set +# CONFIG_PPS_CLIENT_GPIO is not set + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=y +CONFIG_PTP_1588_CLOCK_OPTIONAL=y + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +# CONFIG_PTP_1588_CLOCK_IDT82P33 is not set +# CONFIG_PTP_1588_CLOCK_IDTCM is not set +# CONFIG_PTP_1588_CLOCK_VMW is not set +# end of PTP clock support + +# CONFIG_PINCTRL is not set +# CONFIG_GPIOLIB is not set +# CONFIG_W1 is not set +# CONFIG_POWER_RESET is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_TEST_POWER is not set +# CONFIG_CHARGER_ADP5061 is not set +# CONFIG_BATTERY_CW2015 is not set +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_CHARGER_SBS is not set +# CONFIG_BATTERY_BQ27XXX is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_LTC4162L is not set +# CONFIG_CHARGER_BQ2415X is not set +# CONFIG_BATTERY_GAUGE_LTC2941 is not set +# CONFIG_BATTERY_GOLDFISH is not set +# CONFIG_BATTERY_RT5033 is not set +# CONFIG_CHARGER_BD99954 is not set +# CONFIG_HWMON is not set +CONFIG_THERMAL=y +# CONFIG_THERMAL_NETLINK is not set +# CONFIG_THERMAL_STATISTICS is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +# CONFIG_THERMAL_WRITABLE_TRIPS is not set +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_GOV_FAIR_SHARE is not set +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_BANG_BANG is not set +# CONFIG_THERMAL_GOV_USER_SPACE is not set +# CONFIG_THERMAL_EMULATION is not set + +# +# Intel thermal drivers +# +# CONFIG_INTEL_POWERCLAMP is not set +CONFIG_X86_THERMAL_VECTOR=y +# CONFIG_X86_PKG_TEMP_THERMAL is not set +# CONFIG_INTEL_SOC_DTS_THERMAL is not set + +# +# ACPI INT340X thermal drivers +# +# CONFIG_INT340X_THERMAL is not set +# end of ACPI INT340X thermal drivers + +# CONFIG_INTEL_PCH_THERMAL is not set +# CONFIG_INTEL_TCC_COOLING is not set +# end of Intel thermal drivers + +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y +# CONFIG_SSB is not set +CONFIG_BCMA_POSSIBLE=y +# CONFIG_BCMA is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_AS3711 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_BCM590XX is not set +# CONFIG_MFD_BD9571MWV is not set +# CONFIG_MFD_AXP20X_I2C is not set +# CONFIG_MFD_MADERA is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_MFD_DA9055 is not set +# CONFIG_MFD_DA9062 is not set +# CONFIG_MFD_DA9063 is not set +# CONFIG_MFD_DA9150 is not set +# CONFIG_MFD_DLN2 is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_MFD_MP2629 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set +# CONFIG_LPC_ICH is not set +# CONFIG_LPC_SCH is not set +# CONFIG_MFD_INTEL_LPSS_ACPI is not set +# CONFIG_MFD_INTEL_LPSS_PCI is not set +# CONFIG_MFD_INTEL_PMT is not set +# CONFIG_MFD_IQS62X is not set +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX77843 is not set +# CONFIG_MFD_MAX8907 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_MT6360 is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_MENF21BMC is not set +# CONFIG_MFD_VIPERBOARD is not set +# CONFIG_MFD_RETU is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_RT4831 is not set +# CONFIG_MFD_RT5033 is not set +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_SI476X_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SKY81452 is not set +# CONFIG_MFD_SYSCON is not set +# CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_LP3943 is not set +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_TI_LMU is not set +# CONFIG_MFD_PALMAS is not set +# CONFIG_TPS6105X is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65086 is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_TI_LP873X is not set +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_MFD_TPS80031 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set +# CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TQMX86 is not set +# CONFIG_MFD_VX855 is not set +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_ATC260X_I2C is not set +# end of Multifunction device drivers + +# CONFIG_REGULATOR is not set +# CONFIG_RC_CORE is not set +# CONFIG_MEDIA_CEC_SUPPORT is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_AGP is not set +# CONFIG_VGA_ARB is not set +# CONFIG_VGA_SWITCHEROO is not set +CONFIG_DRM=y +# CONFIG_DRM_DP_AUX_CHARDEV is not set +# CONFIG_DRM_DEBUG_MM is not set +# CONFIG_DRM_DEBUG_SELFTEST is not set +# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set +# CONFIG_DRM_DP_CEC is not set + +# +# ARM devices +# +# end of ARM devices + +# CONFIG_DRM_RADEON is not set +# CONFIG_DRM_AMDGPU is not set +# CONFIG_DRM_NOUVEAU is not set +# CONFIG_DRM_I915 is not set +CONFIG_DRM_VGEM=y +# CONFIG_DRM_VKMS is not set +# CONFIG_DRM_VMWGFX is not set +# CONFIG_DRM_GMA500 is not set +# CONFIG_DRM_UDL is not set +# CONFIG_DRM_AST is not set +# CONFIG_DRM_MGAG200 is not set +# CONFIG_DRM_QXL is not set +# CONFIG_DRM_VIRTIO_GPU is not set +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +# end of Display Panels + +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y + +# +# Display Interface Bridges +# +# CONFIG_DRM_ANALOGIX_ANX78XX is not set +# end of Display Interface Bridges + +# CONFIG_DRM_ETNAVIV is not set +# CONFIG_DRM_BOCHS is not set +# CONFIG_DRM_CIRRUS_QEMU is not set +# CONFIG_DRM_GM12U320 is not set +# CONFIG_DRM_SIMPLEDRM is not set +# CONFIG_DRM_VBOXVIDEO is not set +# CONFIG_DRM_GUD is not set +# CONFIG_DRM_HYPERV is not set +# CONFIG_DRM_LEGACY is not set +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y + +# +# Frame buffer Devices +# +CONFIG_FB_CMDLINE=y +# CONFIG_FB is not set +# end of Frame buffer Devices + +# +# Backlight & LCD device support +# +# CONFIG_LCD_CLASS_DEVICE is not set +# CONFIG_BACKLIGHT_CLASS_DEVICE is not set +# end of Backlight & LCD device support + +CONFIG_HDMI=y + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_DUMMY_CONSOLE_COLUMNS=80 +CONFIG_DUMMY_CONSOLE_ROWS=25 +# end of Console display driver support +# end of Graphics support + +# CONFIG_SOUND is not set + +# +# HID support +# +CONFIG_HID=y +# CONFIG_HID_BATTERY_STRENGTH is not set +# CONFIG_HIDRAW is not set +# CONFIG_UHID is not set +CONFIG_HID_GENERIC=y + +# +# Special HID drivers +# +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_ACCUTOUCH is not set +# CONFIG_HID_ACRUX is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_APPLEIR is not set +# CONFIG_HID_AUREAL is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_BETOP_FF is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_COUGAR is not set +# CONFIG_HID_MACALLY is not set +# CONFIG_HID_CMEDIA is not set +# CONFIG_HID_CREATIVE_SB0540 is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EMS_FF is not set +# CONFIG_HID_ELECOM is not set +# CONFIG_HID_ELO is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_GEMBIRD is not set +# CONFIG_HID_GFRM is not set +# CONFIG_HID_GLORIOUS is not set +# CONFIG_HID_HOLTEK is not set +# CONFIG_HID_VIVALDI is not set +# CONFIG_HID_KEYTOUCH is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_UCLOGIC is not set +# CONFIG_HID_WALTOP is not set +# CONFIG_HID_VIEWSONIC is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_ICADE is not set +# CONFIG_HID_ITE is not set +# CONFIG_HID_JABRA is not set +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LCPOWER is not set +# CONFIG_HID_LENOVO is not set +# CONFIG_HID_MAGICMOUSE is not set +# CONFIG_HID_MALTRON is not set +# CONFIG_HID_MAYFLASH is not set +# CONFIG_HID_REDRAGON is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_MULTITOUCH is not set +# CONFIG_HID_NTI is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_ORTEK is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PENMOUNT is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_PICOLCD is not set +# CONFIG_HID_PLANTRONICS is not set +# CONFIG_HID_PLAYSTATION is not set +# CONFIG_HID_PRIMAX is not set +# CONFIG_HID_RETRODE is not set +# CONFIG_HID_ROCCAT is not set +# CONFIG_HID_SAITEK is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SEMITEK is not set +# CONFIG_HID_SPEEDLINK is not set +# CONFIG_HID_STEAM is not set +# CONFIG_HID_STEELSERIES is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_RMI is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_HYPERV_MOUSE is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TIVO is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_UDRAW_PS3 is not set +# CONFIG_HID_WACOM is not set +# CONFIG_HID_XINMO is not set +# CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set +# CONFIG_HID_SENSOR_HUB is not set +# CONFIG_HID_ALPS is not set +# end of Special HID drivers + +# +# USB HID support +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set +# end of USB HID support + +# +# I2C HID support +# +# CONFIG_I2C_HID_ACPI is not set +# end of I2C HID support + +# +# Intel ISH HID support +# +# CONFIG_INTEL_ISH_HID is not set +# end of Intel ISH HID support + +# +# AMD SFH HID Support +# +# CONFIG_AMD_SFH_HID is not set +# end of AMD SFH HID Support +# end of HID support + +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +# CONFIG_USB_ULPI_BUS is not set +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=y +# CONFIG_USB_PCI is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +# CONFIG_USB_FEW_INIT_RETRIES is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG_PRODUCTLIST is not set +# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set +CONFIG_USB_AUTOSUSPEND_DELAY=2 +# CONFIG_USB_MON is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_XHCI_HCD is not set +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_FOTG210_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=y +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +# CONFIG_USB_STORAGE is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +CONFIG_USBIP_CORE=y +CONFIG_USBIP_VHCI_HCD=y +CONFIG_USBIP_VHCI_HC_PORTS=8 +CONFIG_USBIP_VHCI_NR_HCS=1 +# CONFIG_USBIP_HOST is not set +# CONFIG_USBIP_DEBUG is not set +# CONFIG_USB_CDNS_SUPPORT is not set +# CONFIG_USB_MUSB_HDRC is not set +# CONFIG_USB_DWC3 is not set +# CONFIG_USB_DWC2 is not set +# CONFIG_USB_ISP1760 is not set + +# +# USB port drivers +# +CONFIG_USB_SERIAL=y +# CONFIG_USB_SERIAL_CONSOLE is not set +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_SIMPLE is not set +# CONFIG_USB_SERIAL_AIRCABLE is not set +# CONFIG_USB_SERIAL_ARK3116 is not set +# CONFIG_USB_SERIAL_BELKIN is not set +CONFIG_USB_SERIAL_CH341=y +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +CONFIG_USB_SERIAL_CP210X=y +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +# CONFIG_USB_SERIAL_EMPEG is not set +CONFIG_USB_SERIAL_FTDI_SIO=y +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_F81232 is not set +# CONFIG_USB_SERIAL_F8153X is not set +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +# CONFIG_USB_SERIAL_IUU is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_METRO is not set +# CONFIG_USB_SERIAL_MOS7720 is not set +# CONFIG_USB_SERIAL_MOS7840 is not set +# CONFIG_USB_SERIAL_MXUPORT is not set +# CONFIG_USB_SERIAL_NAVMAN is not set +# CONFIG_USB_SERIAL_PL2303 is not set +# CONFIG_USB_SERIAL_OTI6858 is not set +# CONFIG_USB_SERIAL_QCAUX is not set +# CONFIG_USB_SERIAL_QUALCOMM is not set +# CONFIG_USB_SERIAL_SPCP8X5 is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set +# CONFIG_USB_SERIAL_SYMBOL is not set +# CONFIG_USB_SERIAL_TI is not set +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_OPTION is not set +# CONFIG_USB_SERIAL_OMNINET is not set +# CONFIG_USB_SERIAL_OPTICON is not set +# CONFIG_USB_SERIAL_XSENS_MT is not set +# CONFIG_USB_SERIAL_WISHBONE is not set +# CONFIG_USB_SERIAL_SSU100 is not set +# CONFIG_USB_SERIAL_QT2 is not set +# CONFIG_USB_SERIAL_UPD78F0730 is not set +# CONFIG_USB_SERIAL_XR is not set +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_APPLE_MFI_FASTCHARGE is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_EHSET_TEST_FIXTURE is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_YUREX is not set +# CONFIG_USB_EZUSB_FX2 is not set +# CONFIG_USB_HUB_USB251XB is not set +# CONFIG_USB_HSIC_USB3503 is not set +# CONFIG_USB_HSIC_USB4604 is not set +# CONFIG_USB_LINK_LAYER_TEST is not set + +# +# USB Physical Layer drivers +# +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_USB_ISP1301 is not set +# end of USB Physical Layer drivers + +# CONFIG_USB_GADGET is not set +# CONFIG_TYPEC is not set +# CONFIG_USB_ROLE_SWITCH is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_MC146818_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set +CONFIG_RTC_NVMEM=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_ABB5ZES3 is not set +# CONFIG_RTC_DRV_ABEOZ9 is not set +# CONFIG_RTC_DRV_ABX80X is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8523 is not set +# CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_PCF85363 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8010 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set +# CONFIG_RTC_DRV_EM3027 is not set +# CONFIG_RTC_DRV_RV3028 is not set +# CONFIG_RTC_DRV_RV3032 is not set +# CONFIG_RTC_DRV_RV8803 is not set +# CONFIG_RTC_DRV_SD3078 is not set + +# +# SPI RTC drivers +# +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_PCF2127 is not set +# CONFIG_RTC_DRV_RV3029C2 is not set +# CONFIG_RTC_DRV_RX6110 is not set + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1685_FAMILY is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_DS2404 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_FTRTC010 is not set + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_GOLDFISH is not set +# CONFIG_DMADEVICES is not set + +# +# DMABUF options +# +CONFIG_SYNC_FILE=y +# CONFIG_SW_SYNC is not set +# CONFIG_UDMABUF is not set +# CONFIG_DMABUF_MOVE_NOTIFY is not set +# CONFIG_DMABUF_DEBUG is not set +# CONFIG_DMABUF_SELFTESTS is not set +# CONFIG_DMABUF_HEAPS is not set +# CONFIG_DMABUF_SYSFS_STATS is not set +# end of DMABUF options + +# CONFIG_AUXDISPLAY is not set +CONFIG_UIO=y +# CONFIG_UIO_CIF is not set +CONFIG_UIO_PDRV_GENIRQ=y +CONFIG_UIO_DMEM_GENIRQ=y +# CONFIG_UIO_AEC is not set +# CONFIG_UIO_SERCOS3 is not set +# CONFIG_UIO_PCI_GENERIC is not set +# CONFIG_UIO_NETX is not set +# CONFIG_UIO_PRUSS is not set +# CONFIG_UIO_MF624 is not set +# CONFIG_UIO_HV_GENERIC is not set +CONFIG_VFIO=y +CONFIG_VFIO_IOMMU_TYPE1=y +CONFIG_VFIO_VIRQFD=y +# CONFIG_VFIO_NOIOMMU is not set +CONFIG_VFIO_PCI_CORE=y +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_INTX=y +CONFIG_VFIO_PCI=y +# CONFIG_VFIO_PCI_IGD is not set +CONFIG_VFIO_MDEV=y +CONFIG_IRQ_BYPASS_MANAGER=y +# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI_LIB=y +CONFIG_VIRTIO_MENU=y +CONFIG_VIRTIO_PCI=y +# CONFIG_VIRTIO_PCI_LEGACY is not set +# CONFIG_VIRTIO_VDPA is not set +CONFIG_VIRTIO_PMEM=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_MEM=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +CONFIG_VDPA=y +# CONFIG_VDPA_USER is not set +# CONFIG_IFCVF is not set +# CONFIG_VP_VDPA is not set +CONFIG_VHOST_IOTLB=y +CONFIG_VHOST=y +CONFIG_VHOST_MENU=y +CONFIG_VHOST_NET=y +# CONFIG_VHOST_VSOCK is not set +CONFIG_VHOST_VDPA=y +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=y +CONFIG_HYPERV_TIMER=y +CONFIG_HYPERV_UTILS=y +CONFIG_HYPERV_BALLOON=y +CONFIG_DXGKRNL=y +# end of Microsoft Hyper-V guest support + +# CONFIG_GREYBUS is not set +# CONFIG_COMEDI is not set +# CONFIG_STAGING is not set +# CONFIG_X86_PLATFORM_DEVICES is not set +CONFIG_PMC_ATOM=y +# CONFIG_CHROME_PLATFORMS is not set +# CONFIG_MELLANOX_PLATFORM is not set +# CONFIG_SURFACE_PLATFORMS is not set +CONFIG_HAVE_CLK=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Clock driver for ARM Reference designs +# +# CONFIG_ICST is not set +# CONFIG_CLK_SP810 is not set +# end of Clock driver for ARM Reference designs + +# CONFIG_COMMON_CLK_MAX9485 is not set +# CONFIG_COMMON_CLK_SI5341 is not set +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_SI544 is not set +# CONFIG_COMMON_CLK_CDCE706 is not set +# CONFIG_COMMON_CLK_CS2000_CP is not set +# CONFIG_XILINX_VCU is not set +# CONFIG_HWSPINLOCK is not set + +# +# Clock Source drivers +# +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +# end of Clock Source drivers + +# CONFIG_MAILBOX is not set +CONFIG_IOMMU_IOVA=y +CONFIG_IOASID=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +CONFIG_IOMMU_IO_PGTABLE=y +# end of Generic IOMMU Pagetable Support + +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set +CONFIG_IOMMU_DEFAULT_DMA_LAZY=y +# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_IOMMU_DMA=y +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_V2 is not set +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_SVM is not set +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set +# CONFIG_IRQ_REMAP is not set +# CONFIG_HYPERV_IOMMU is not set +# CONFIG_VIRTIO_IOMMU is not set + +# +# Remoteproc drivers +# +# CONFIG_REMOTEPROC is not set +# end of Remoteproc drivers + +# +# Rpmsg drivers +# +# CONFIG_RPMSG_VIRTIO is not set +# end of Rpmsg drivers + +# CONFIG_SOUNDWIRE is not set + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# +# end of Amlogic SoC drivers + +# +# Broadcom SoC drivers +# +# end of Broadcom SoC drivers + +# +# NXP/Freescale QorIQ SoC drivers +# +# end of NXP/Freescale QorIQ SoC drivers + +# +# i.MX SoC drivers +# +# end of i.MX SoC drivers + +# +# Enable LiteX SoC Builder specific drivers +# +# end of Enable LiteX SoC Builder specific drivers + +# +# Qualcomm SoC drivers +# +# end of Qualcomm SoC drivers + +# CONFIG_SOC_TI is not set + +# +# Xilinx SoC drivers +# +# end of Xilinx SoC drivers +# end of SOC (System On Chip) specific Drivers + +# CONFIG_PM_DEVFREQ is not set +# CONFIG_EXTCON is not set +# CONFIG_MEMORY is not set +# CONFIG_IIO is not set +# CONFIG_NTB is not set +# CONFIG_VME_BUS is not set +# CONFIG_PWM is not set + +# +# IRQ chip support +# +# end of IRQ chip support + +# CONFIG_IPACK_BUS is not set +# CONFIG_RESET_CONTROLLER is not set + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +# CONFIG_USB_LGM_PHY is not set +# CONFIG_PHY_CAN_TRANSCEIVER is not set +# CONFIG_BCM_KONA_USB2_PHY is not set +# CONFIG_PHY_PXA_28NM_HSIC is not set +# CONFIG_PHY_PXA_28NM_USB2 is not set +# CONFIG_PHY_INTEL_LGM_EMMC is not set +# end of PHY Subsystem + +# CONFIG_POWERCAP is not set +# CONFIG_MCB is not set + +# +# Performance monitor support +# +# end of Performance monitor support + +CONFIG_RAS=y +# CONFIG_USB4 is not set + +# +# Android +# +# CONFIG_ANDROID is not set +# end of Android + +CONFIG_LIBNVDIMM=y +CONFIG_BLK_DEV_PMEM=y +CONFIG_ND_BLK=y +CONFIG_ND_CLAIM=y +CONFIG_ND_BTT=y +CONFIG_BTT=y +CONFIG_ND_PFN=y +CONFIG_NVDIMM_PFN=y +CONFIG_NVDIMM_DAX=y +CONFIG_DAX_DRIVER=y +CONFIG_DAX=y +CONFIG_DEV_DAX=y +CONFIG_DEV_DAX_PMEM=y +CONFIG_DEV_DAX_KMEM=y +CONFIG_NVMEM=y +# CONFIG_NVMEM_SYSFS is not set +# CONFIG_NVMEM_RMEM is not set + +# +# HW tracing support +# +# CONFIG_STM is not set +# CONFIG_INTEL_TH is not set +# end of HW tracing support + +# CONFIG_FPGA is not set +# CONFIG_TEE is not set +# CONFIG_UNISYS_VISORBUS is not set +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set +# CONFIG_INTERCONNECT is not set +# CONFIG_COUNTER is not set +# end of Device Drivers + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# CONFIG_VALIDATE_FS_PARSER is not set +CONFIG_FS_IOMAP=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_SUPPORT_V4 is not set +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +CONFIG_XFS_ONLINE_SCRUB=y +CONFIG_XFS_ONLINE_REPAIR=y +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set +# CONFIG_GFS2_FS is not set +CONFIG_BTRFS_FS=y +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set +# CONFIG_BTRFS_FS_REF_VERIFY is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_F2FS_FS is not set +CONFIG_FS_DAX=y +CONFIG_FS_DAX_PMD=y +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_EXPORTFS_BLOCK_OPS=y +CONFIG_FILE_LOCKING=y +# CONFIG_FS_ENCRYPTION is not set +# CONFIG_FS_VERITY is not set +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +# CONFIG_QFMT_V1 is not set +# CONFIG_QFMT_V2 is not set +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=y +CONFIG_AUTOFS_FS=y +CONFIG_FUSE_FS=y +CONFIG_CUSE=y +CONFIG_VIRTIO_FS=y +CONFIG_FUSE_DAX=y +CONFIG_OVERLAY_FS=y +# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set +# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set +# CONFIG_OVERLAY_FS_INDEX is not set +# CONFIG_OVERLAY_FS_XINO_AUTO is not set +# CONFIG_OVERLAY_FS_METACOPY is not set + +# +# Caches +# +CONFIG_NETFS_SUPPORT=y +# CONFIG_NETFS_STATS is not set +CONFIG_FSCACHE=y +# CONFIG_FSCACHE_STATS is not set +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_CACHEFILES is not set +# end of Caches + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=y +# end of CD-ROM/DVD Filesystems + +# +# DOS/FAT/EXFAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set +# CONFIG_EXFAT_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS3_FS is not set +# end of DOS/FAT/EXFAT/NT Filesystems + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_PROC_CHILDREN=y +CONFIG_PROC_PID_ARCH_STATUS=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +# CONFIG_TMPFS_INODE64 is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_HUGETLB_PAGE_FREE_VMEMMAP=y +# CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON is not set +CONFIG_MEMFD_CREATE=y +CONFIG_ARCH_HAS_GIGANTIC_PAGE=y +# CONFIG_CONFIGFS_FS is not set +# CONFIG_EFIVAR_FS is not set +# end of Pseudo filesystems + +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ORANGEFS_FS is not set +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +CONFIG_SQUASHFS_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZ4=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +CONFIG_SQUASHFS_ZSTD=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_PSTORE is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_EROFS_FS=y +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_ZIP=y +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V2=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_SWAP is not set +CONFIG_NFS_V4_1=y +# CONFIG_NFS_V4_2 is not set +CONFIG_PNFS_FILE_LAYOUT=y +CONFIG_PNFS_BLOCK=y +CONFIG_PNFS_FLEXFILE_LAYOUT=y +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +# CONFIG_NFS_V4_1_MIGRATION is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFS_FSCACHE is not set +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set +CONFIG_NFSD=y +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_PNFS=y +CONFIG_NFSD_BLOCKLAYOUT=y +CONFIG_NFSD_SCSILAYOUT=y +CONFIG_NFSD_FLEXFILELAYOUT=y +CONFIG_NFSD_V4_SECURITY_LABEL=y +CONFIG_GRACE_PERIOD=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_SUNRPC_BACKCHANNEL=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_SUNRPC_DEBUG is not set +CONFIG_CEPH_FS=y +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +# CONFIG_CEPH_FS_SECURITY_LABEL is not set +CONFIG_CIFS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y +# CONFIG_CIFS_UPCALL is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG is not set +# CONFIG_CIFS_DFS_UPCALL is not set +# CONFIG_CIFS_SWN_UPCALL is not set +# CONFIG_CIFS_FSCACHE is not set +# CONFIG_CIFS_ROOT is not set +# CONFIG_SMB_SERVER is not set +CONFIG_SMBFS_COMMON=y +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +CONFIG_9P_FS=y +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set +CONFIG_NLS_UTF8=y +# CONFIG_UNICODE is not set +CONFIG_IO_WQ=y +# end of File systems + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_KEYS_REQUEST_CACHE is not set +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_KEY_DH_OPERATIONS is not set +CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_SECURITY=y +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_NETWORK is not set +CONFIG_SECURITY_PATH=y +# CONFIG_INTEL_TXT is not set +CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y +CONFIG_HARDENED_USERCOPY=y +# CONFIG_HARDENED_USERCOPY_FALLBACK is not set +# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set +CONFIG_FORTIFY_SOURCE=y +# CONFIG_STATIC_USERMODEHELPER is not set +# CONFIG_SECURITY_SMACK is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set +# CONFIG_SECURITY_LOADPIN is not set +# CONFIG_SECURITY_YAMA is not set +# CONFIG_SECURITY_SAFESETID is not set +# CONFIG_SECURITY_LOCKDOWN_LSM is not set +CONFIG_SECURITY_LANDLOCK=y +# CONFIG_INTEGRITY is not set +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf" + +# +# Kernel hardening options +# + +# +# Memory initialization +# +CONFIG_INIT_STACK_NONE=y +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y +# CONFIG_ZERO_CALL_USED_REGS is not set +# end of Memory initialization +# end of Kernel hardening options +# end of Security options + +CONFIG_XOR_BLOCKS=y +CONFIG_ASYNC_CORE=y +CONFIG_ASYNC_MEMCPY=y +CONFIG_ASYNC_XOR=y +CONFIG_ASYNC_PQ=y +CONFIG_ASYNC_RAID6_RECOV=y +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SKCIPHER=y +CONFIG_CRYPTO_SKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_KPP2=y +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_USER is not set +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_NULL2=y +# CONFIG_CRYPTO_PCRYPT is not set +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_AUTHENC=y +# CONFIG_CRYPTO_TEST is not set + +# +# Public-key cryptography +# +CONFIG_CRYPTO_RSA=y +# CONFIG_CRYPTO_DH is not set +# CONFIG_CRYPTO_ECDH is not set +# CONFIG_CRYPTO_ECDSA is not set +# CONFIG_CRYPTO_ECRDSA is not set +# CONFIG_CRYPTO_SM2 is not set +# CONFIG_CRYPTO_CURVE25519 is not set +CONFIG_CRYPTO_CURVE25519_X86=y + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=y +CONFIG_CRYPTO_GCM=y +# CONFIG_CRYPTO_CHACHA20POLY1305 is not set +# CONFIG_CRYPTO_AEGIS128 is not set +# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set +CONFIG_CRYPTO_SEQIV=y +CONFIG_CRYPTO_ECHAINIV=y + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CFB is not set +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_CTS=y +CONFIG_CRYPTO_ECB=y +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_OFB is not set +# CONFIG_CRYPTO_PCBC is not set +CONFIG_CRYPTO_XTS=y +# CONFIG_CRYPTO_KEYWRAP is not set +# CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set +# CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set +# CONFIG_CRYPTO_ADIANTUM is not set +CONFIG_CRYPTO_ESSIV=y + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_CRC32C_INTEL is not set +# CONFIG_CRYPTO_CRC32 is not set +# CONFIG_CRYPTO_CRC32_PCLMUL is not set +CONFIG_CRYPTO_XXHASH=y +CONFIG_CRYPTO_BLAKE2B=y +CONFIG_CRYPTO_BLAKE2S_X86=y +# CONFIG_CRYPTO_CRCT10DIF is not set +CONFIG_CRYPTO_GHASH=y +# CONFIG_CRYPTO_POLY1305 is not set +CONFIG_CRYPTO_POLY1305_X86_64=y +CONFIG_CRYPTO_MD4=y +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD160 is not set +CONFIG_CRYPTO_SHA1=y +# CONFIG_CRYPTO_SHA1_SSSE3 is not set +# CONFIG_CRYPTO_SHA256_SSSE3 is not set +# CONFIG_CRYPTO_SHA512_SSSE3 is not set +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +# CONFIG_CRYPTO_SHA3 is not set +# CONFIG_CRYPTO_SM3 is not set +# CONFIG_CRYPTO_STREEBOG is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_AES_TI is not set +# CONFIG_CRYPTO_AES_NI_INTEL is not set +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_ARC4=y +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAMELLIA_X86_64 is not set +# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set +# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_CHACHA20 is not set +CONFIG_CRYPTO_CHACHA20_X86_64=y +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set +# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set +# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set +# CONFIG_CRYPTO_SM4 is not set +# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set +# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_TWOFISH_X86_64 is not set +# CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set +# CONFIG_CRYPTO_TWOFISH_AVX_X86_64 is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_LZO is not set +# CONFIG_CRYPTO_842 is not set +# CONFIG_CRYPTO_LZ4 is not set +# CONFIG_CRYPTO_LZ4HC is not set +# CONFIG_CRYPTO_ZSTD is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_DRBG_HMAC=y +# CONFIG_CRYPTO_DRBG_HASH is not set +# CONFIG_CRYPTO_DRBG_CTR is not set +CONFIG_CRYPTO_DRBG=y +CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_USER_API=y +CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API_SKCIPHER=y +# CONFIG_CRYPTO_USER_API_RNG is not set +# CONFIG_CRYPTO_USER_API_AEAD is not set +CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_PADLOCK is not set +# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +# CONFIG_CRYPTO_DEV_CCP is not set +# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set +# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set +# CONFIG_CRYPTO_DEV_QAT_C62X is not set +# CONFIG_CRYPTO_DEV_QAT_4XXX is not set +# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set +# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set +# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set +# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set +# CONFIG_CRYPTO_DEV_VIRTIO is not set +# CONFIG_CRYPTO_DEV_SAFEXCEL is not set +# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set +CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PKCS7_TEST_KEY is not set +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set + +# +# Certificates for signature checking +# +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set +# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +# end of Certificates for signature checking + +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=y +# CONFIG_RAID6_PQ_BENCHMARK is not set +# CONFIG_PACKING is not set +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +# CONFIG_CORDIC is not set +# CONFIG_PRIME_NUMBERS is not set +CONFIG_RATIONAL=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_ARCH_USE_SYM_ANNOTATIONS=y + +# +# Crypto library routines +# +CONFIG_CRYPTO_LIB_AES=y +CONFIG_CRYPTO_LIB_ARC4=y +CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y +CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y +CONFIG_CRYPTO_LIB_CHACHA=y +CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=y +CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y +CONFIG_CRYPTO_LIB_CURVE25519=y +CONFIG_CRYPTO_LIB_DES=y +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 +CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y +CONFIG_CRYPTO_LIB_POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_SHA256=y +# end of Crypto library routines + +CONFIG_LIB_MEMNEQ=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +# CONFIG_CRC_T10DIF is not set +CONFIG_CRC_ITU_T=y +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +# CONFIG_CRC64 is not set +# CONFIG_CRC4 is not set +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=y +# CONFIG_CRC8 is not set +CONFIG_XXHASH=y +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZSTD_COMPRESS=y +CONFIG_ZSTD_DECOMPRESS=y +CONFIG_XZ_DEC=y +# CONFIG_XZ_DEC_X86 is not set +# CONFIG_XZ_DEC_POWERPC is not set +# CONFIG_XZ_DEC_IA64 is not set +# CONFIG_XZ_DEC_ARM is not set +# CONFIG_XZ_DEC_ARMTHUMB is not set +# CONFIG_XZ_DEC_SPARC is not set +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_ZSTD=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=y +CONFIG_INTERVAL_TREE=y +CONFIG_XARRAY_MULTI=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_DMA_OPS=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_SWIOTLB=y +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_DMA_MAP_BENCHMARK is not set +CONFIG_SGL_ALLOC=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_CLZ_TAB=y +# CONFIG_IRQ_POLL is not set +CONFIG_MPILIB=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_HAVE_GENERIC_VDSO=y +CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_VDSO_TIME_NS=y +CONFIG_FONT_SUPPORT=y +CONFIG_FONT_8x16=y +CONFIG_FONT_AUTOSELECT=y +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_PMEM_API=y +CONFIG_MEMREGION=y +CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y +CONFIG_ARCH_HAS_COPY_MC=y +CONFIG_ARCH_STACKWALK=y +CONFIG_SBITMAP=y +# end of Library routines + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +# CONFIG_PRINTK_CALLER is not set +# CONFIG_STACKTRACE_BUILD_ID is not set +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=2 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=1 +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DYNAMIC_DEBUG_CORE is not set +# CONFIG_SYMBOLIC_ERRNAME is not set +CONFIG_DEBUG_BUGVERBOSE=y +# end of printk and dmesg options + +CONFIG_AS_HAS_NON_CONST_LEB128=y + +# +# Compile-time checks and compiler options +# +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_REDUCED is not set +# CONFIG_DEBUG_INFO_COMPRESSED is not set +# CONFIG_DEBUG_INFO_SPLIT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y +# CONFIG_DEBUG_INFO_DWARF4 is not set +CONFIG_DEBUG_INFO_BTF=y +CONFIG_PAHOLE_HAS_SPLIT_BTF=y +CONFIG_DEBUG_INFO_BTF_MODULES=y +# CONFIG_GDB_SCRIPTS is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set +# CONFIG_HEADERS_INSTALL is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set +# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set +CONFIG_STACK_VALIDATION=y +# CONFIG_VMLINUX_MAP is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# end of Compile-time checks and compiler options + +# +# Generic Kernel Debugging Instruments +# +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_FS_ALLOW_ALL=y +# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set +# CONFIG_DEBUG_FS_ALLOW_NONE is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +# CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KCSAN=y +CONFIG_HAVE_KCSAN_COMPILER=y +# CONFIG_KCSAN is not set +# end of Generic Kernel Debugging Instruments + +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_MISC is not set + +# +# Memory Debugging +# +# CONFIG_PAGE_EXTENSION is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_OWNER is not set +# CONFIG_PAGE_POISONING is not set +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +CONFIG_ARCH_HAS_DEBUG_WX=y +# CONFIG_DEBUG_WX is not set +CONFIG_GENERIC_PTDUMP=y +# CONFIG_PTDUMP_DEBUGFS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_STACK_USAGE is not set +CONFIG_SCHED_STACK_END_CHECK=y +CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VM_PGTABLE is not set +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +# CONFIG_DEBUG_VIRTUAL is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y +# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_HAVE_ARCH_KASAN_VMALLOC=y +CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +# CONFIG_KASAN is not set +CONFIG_HAVE_ARCH_KFENCE=y +# CONFIG_KFENCE is not set +# end of Memory Debugging + +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Oops, Lockups and Hangs +# +CONFIG_PANIC_ON_OOPS=y +CONFIG_PANIC_ON_OOPS_VALUE=1 +CONFIG_PANIC_TIMEOUT=0 +# CONFIG_SOFTLOCKUP_DETECTOR is not set +CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y +# CONFIG_HARDLOCKUP_DETECTOR is not set +# CONFIG_DETECT_HUNG_TASK is not set +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_TEST_LOCKUP is not set +# end of Debug Oops, Lockups and Hangs + +# +# Scheduler Debugging +# +CONFIG_SCHED_DEBUG=y +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +# end of Scheduler Debugging + +# CONFIG_DEBUG_TIMEKEEPING is not set + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +CONFIG_LOCK_DEBUGGING_SUPPORT=y +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set +# CONFIG_WW_MUTEX_SELFTEST is not set +# CONFIG_SCF_TORTURE_TEST is not set +# CONFIG_CSD_LOCK_WAIT_DEBUG is not set +# end of Lock Debugging (spinlocks, mutexes, etc...) + +# CONFIG_DEBUG_IRQFLAGS is not set +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set + +# +# Debug kernel data structures +# +CONFIG_DEBUG_LIST=y +# CONFIG_DEBUG_PLIST is not set +CONFIG_DEBUG_SG=y +CONFIG_DEBUG_NOTIFIERS=y +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# end of Debug kernel data structures + +CONFIG_DEBUG_CREDENTIALS=y + +# +# RCU Debugging +# +# CONFIG_RCU_SCALE_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_REF_SCALE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# end of RCU Debugging + +# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +# CONFIG_LATENCYTOP is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y +CONFIG_HAVE_OBJTOOL_MCOUNT=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_BOOTTIME_TRACING is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y +CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_STACK_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +CONFIG_SCHED_TRACER=y +CONFIG_HWLAT_TRACER=y +# CONFIG_OSNOISE_TRACER is not set +# CONFIG_TIMERLAT_TRACER is not set +# CONFIG_MMIOTRACE is not set +CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y +CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_KPROBE_EVENTS=y +# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set +CONFIG_UPROBE_EVENTS=y +CONFIG_BPF_EVENTS=y +CONFIG_DYNAMIC_EVENTS=y +CONFIG_PROBE_EVENTS=y +CONFIG_FTRACE_MCOUNT_RECORD=y +CONFIG_FTRACE_MCOUNT_USE_CC=y +# CONFIG_SYNTH_EVENTS is not set +# CONFIG_HIST_TRIGGERS is not set +# CONFIG_TRACE_EVENT_INJECT is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set +# CONFIG_FTRACE_RECORD_RECURSION is not set +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set +# CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_KPROBE_EVENT_GEN_TEST is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_SAMPLES is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +# CONFIG_STRICT_DEVMEM is not set + +# +# x86 Debugging +# +# CONFIG_X86_VERBOSE_BOOTUP is not set +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +# CONFIG_EARLY_PRINTK_USB_XDBC is not set +# CONFIG_EFI_PGT_DUMP is not set +# CONFIG_DEBUG_TLBFLUSH is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_DEBUG_ENTRY is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set +# CONFIG_X86_DEBUG_FPU is not set +# CONFIG_PUNIT_ATOM_DEBUG is not set +CONFIG_UNWINDER_ORC=y +# CONFIG_UNWINDER_FRAME_POINTER is not set +# CONFIG_UNWINDER_GUESS is not set +# end of x86 Debugging + +# +# Kernel Testing and Coverage +# +# CONFIG_KUNIT is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set +# CONFIG_RUNTIME_TESTING_MENU is not set +CONFIG_ARCH_USE_MEMTEST=y +# CONFIG_MEMTEST is not set +# CONFIG_HYPERV_TESTING is not set +# end of Kernel Testing and Coverage +# end of Kernel hacking diff --git a/wsl2/kernel/config-wsl-5.10 b/wsl2/kernel/config-wsl-6.1 similarity index 100% rename from wsl2/kernel/config-wsl-5.10 rename to wsl2/kernel/config-wsl-6.1 From fe636fc1faaaa3e0679e70708a480546bda2a3c2 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Fri, 25 Aug 2023 10:51:15 +0800 Subject: [PATCH 19/42] [Actions] Update setup-docker [sync git] Signed-off-by: Kang Huaishuai --- .github/actions/setup-docker/.github/workflows/ci.yaml | 5 +++-- .github/actions/setup-docker/lib/setup-docker.js | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-docker/.github/workflows/ci.yaml b/.github/actions/setup-docker/.github/workflows/ci.yaml index 430c1ad77..b3403fc17 100644 --- a/.github/actions/setup-docker/.github/workflows/ci.yaml +++ b/.github/actions/setup-docker/.github/workflows/ci.yaml @@ -20,6 +20,8 @@ jobs: - 18.09 - 19.03 - "20.10" + - "23.0" + - "24.0" docker_channel: - stable - test @@ -28,7 +30,7 @@ jobs: - ubuntu-20.04 - ubuntu-22.04 - ubuntu-latest - - macos-12 + - macos-13 include: # macOS - os: macos-latest @@ -140,7 +142,6 @@ jobs: fail-fast: false matrix: os: - - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - ubuntu-latest diff --git a/.github/actions/setup-docker/lib/setup-docker.js b/.github/actions/setup-docker/lib/setup-docker.js index 74aa133ee..b7b8e71f8 100644 --- a/.github/actions/setup-docker/lib/setup-docker.js +++ b/.github/actions/setup-docker/lib/setup-docker.js @@ -318,7 +318,7 @@ system_profiler SPHardwareDataType || true 'docker-ce', '|', 'grep', - '20.10' + '24.0' ]); core.endGroup() @@ -347,6 +347,7 @@ system_profiler SPHardwareDataType || true await exec.exec('sudo', [ 'apt-get', '-y', + '--allow-downgrades', 'install', DOCKER_VERSION_STRING ? `docker-ce=${DOCKER_VERSION_STRING}` : 'docker-ce', DOCKER_VERSION_STRING ? `docker-ce-cli=${DOCKER_VERSION_STRING}` : 'docker-ce-cli' From 24cc6307be5c76c4ac1c0b12df4bad0bb12563e6 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Fri, 25 Aug 2023 11:09:04 +0800 Subject: [PATCH 20/42] [Actions] Update setup-docker [sync actions] Signed-off-by: Kang Huaishuai --- .../setup-docker/.github/workflows/ci.yaml | 64 ++++---- .github/actions/setup-docker/action.yml | 2 +- .../actions/setup-docker/lib/setup-docker.js | 138 +++++++++--------- 3 files changed, 102 insertions(+), 102 deletions(-) diff --git a/.github/actions/setup-docker/.github/workflows/ci.yaml b/.github/actions/setup-docker/.github/workflows/ci.yaml index b3403fc17..f2230b89b 100644 --- a/.github/actions/setup-docker/.github/workflows/ci.yaml +++ b/.github/actions/setup-docker/.github/workflows/ci.yaml @@ -17,8 +17,8 @@ jobs: fail-fast: false matrix: docker_version: - - 18.09 - - 19.03 + # - 18.09 + # - 19.03 - "20.10" - "23.0" - "24.0" @@ -137,36 +137,36 @@ jobs: # channel: ${{ matrix.docker_channel }} push_image: ${{ github.event_name == 'push' }} - docker-nightly: - strategy: - fail-fast: false - matrix: - os: - - ubuntu-20.04 - - ubuntu-22.04 - - ubuntu-latest - runs-on: ${{ matrix.os }} - defaults: - run: - shell: bash --noprofile --norc -exo pipefail {0} - steps: - - uses: actions/checkout@main - with: - fetch-depth: 2 - - uses: azure/docker-login@v1 - if: | - github.event_name == 'push' - with: - # login-server: contoso.azurecr.io - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - name: setup docker - uses: ./ - # uses: docker-practice/actions-setup-docker@master - with: - docker_nightly_version: snapshot-20210202 - docker_channel: nightly - - run: docker version + # docker-nightly: + # strategy: + # fail-fast: false + # matrix: + # os: + # - ubuntu-20.04 + # - ubuntu-22.04 + # - ubuntu-latest + # runs-on: ${{ matrix.os }} + # defaults: + # run: + # shell: bash --noprofile --norc -exo pipefail {0} + # steps: + # - uses: actions/checkout@main + # with: + # fetch-depth: 2 + # - uses: azure/docker-login@v1 + # if: | + # github.event_name == 'push' + # with: + # # login-server: contoso.azurecr.io + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_PASSWORD }} + # - name: setup docker + # uses: ./ + # # uses: docker-practice/actions-setup-docker@master + # with: + # docker_nightly_version: snapshot-20210202 + # docker_channel: nightly + # - run: docker version notsupport-platform: strategy: diff --git a/.github/actions/setup-docker/action.yml b/.github/actions/setup-docker/action.yml index e5f773e6c..d5a52d097 100644 --- a/.github/actions/setup-docker/action.yml +++ b/.github/actions/setup-docker/action.yml @@ -6,7 +6,7 @@ author: 'khs1994' inputs: docker_version: description: Docker Version - default: "20.10" + default: "24.0" required: false docker_nightly_version: # https://github.com/AkihiroSuda/moby-snapshot/releases diff --git a/.github/actions/setup-docker/lib/setup-docker.js b/.github/actions/setup-docker/lib/setup-docker.js index b7b8e71f8..e77349dc0 100644 --- a/.github/actions/setup-docker/lib/setup-docker.js +++ b/.github/actions/setup-docker/lib/setup-docker.js @@ -216,73 +216,73 @@ system_profiler SPHardwareDataType || true ]).catch(() => { }); core.endGroup(); - if (DOCKER_CHANNEL === 'nightly') { - if (os.arch() !== 'x64') { - core.warning('nightly version only support x86_64, os arch is ' + os.arch()); - - return; - } - - core.exportVariable('DOCKER_CONFIG', '/home/runner/.docker'); - - core.startGroup('download deb'); - await exec.exec('curl', [ - '-fsSL', - '-o', - '/tmp/moby-snapshot-ubuntu-focal-x86_64-deb.tbz', - `https://github.com/AkihiroSuda/moby-snapshot/releases/download/${DOCKER_NIGHTLY_VERSION}/moby-snapshot-ubuntu-focal-x86_64-deb.tbz` - ]); - core.endGroup(); - - await exec.exec('sudo', [ - 'rm', - '-rf', - '/tmp/*.deb' - ]); - - core.startGroup('unpack tbz file'); - await exec.exec('tar', [ - 'xjvf', - '/tmp/moby-snapshot-ubuntu-focal-x86_64-deb.tbz', - '-C', - '/tmp' - ]); - core.endGroup(); - - core.startGroup('remove default moby'); - await exec.exec('sudo', [ - 'sh', - '-c', - "apt remove -y moby-buildx moby-cli moby-compose moby-containerd moby-engine moby-runc" - ]).catch(() => { }); - core.endGroup(); - - core.startGroup('update apt cache'); - await exec.exec('sudo', [ - 'apt-get', - 'update', - ]).catch(() => { }); - core.endGroup(); - - core.startGroup('install docker'); - await exec.exec('sudo', [ - 'sh', - '-c', - 'apt-get install -y /tmp/*.deb' - ]).catch(async () => { - core.endGroup(); - - core.startGroup('install docker'); - await exec.exec('sudo', [ - 'sh', - '-c', - 'dpkg -i /tmp/*.deb' - ]); - core.endGroup(); - }); - core.endGroup(); - - } else { + // if (DOCKER_CHANNEL === 'nightly') { + // if (os.arch() !== 'x64') { + // core.warning('nightly version only support x86_64, os arch is ' + os.arch()); + + // return; + // } + + // core.exportVariable('DOCKER_CONFIG', '/home/runner/.docker'); + + // core.startGroup('download deb'); + // await exec.exec('curl', [ + // '-fsSL', + // '-o', + // '/tmp/moby-snapshot-ubuntu-focal-x86_64-deb.tbz', + // `https://github.com/AkihiroSuda/moby-snapshot/releases/download/${DOCKER_NIGHTLY_VERSION}/moby-snapshot-ubuntu-focal-x86_64-deb.tbz` + // ]); + // core.endGroup(); + + // await exec.exec('sudo', [ + // 'rm', + // '-rf', + // '/tmp/*.deb' + // ]); + + // core.startGroup('unpack tbz file'); + // await exec.exec('tar', [ + // 'xjvf', + // '/tmp/moby-snapshot-ubuntu-focal-x86_64-deb.tbz', + // '-C', + // '/tmp' + // ]); + // core.endGroup(); + + // core.startGroup('remove default moby'); + // await exec.exec('sudo', [ + // 'sh', + // '-c', + // "apt remove -y moby-buildx moby-cli moby-compose moby-containerd moby-engine moby-runc" + // ]).catch(() => { }); + // core.endGroup(); + + // core.startGroup('update apt cache'); + // await exec.exec('sudo', [ + // 'apt-get', + // 'update', + // ]).catch(() => { }); + // core.endGroup(); + + // core.startGroup('install docker'); + // await exec.exec('sudo', [ + // 'sh', + // '-c', + // 'apt-get install -y /tmp/*.deb' + // ]).catch(async () => { + // core.endGroup(); + + // core.startGroup('install docker'); + // await exec.exec('sudo', [ + // 'sh', + // '-c', + // 'dpkg -i /tmp/*.deb' + // ]); + // core.endGroup(); + // }); + // core.endGroup(); + + // } else { core.exportVariable('DOCKER_CONFIG', '/home/runner/.docker'); core.debug('add apt-key'); @@ -318,7 +318,7 @@ system_profiler SPHardwareDataType || true 'docker-ce', '|', 'grep', - '24.0' + `${DOCKER_VERSION}` ]); core.endGroup() @@ -360,7 +360,7 @@ system_profiler SPHardwareDataType || true 'docker-compose-plugin', ]).catch(() => { }); core.endGroup(); - } + // } message = 'check docker version'; core.debug(message); From d4fcba9ecc2c99d09c34b65fb7cbe674ea47c030 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Fri, 6 Oct 2023 09:44:31 +0800 Subject: [PATCH 21/42] [Kubernetes] Test v1.29.0-alpha.1 [sync git] Signed-off-by: Kang Huaishuai --- kubernetes/.github/workflows/setup-k8s.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index c04492198..061198c51 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -44,11 +44,11 @@ jobs: # GENERATE_CLI_HELP: "true" # next version - # - os: ubuntu - # dist: 20.04 - # CI_KUBERNETES_VERSION: 1.29.0-alpha.1 - # LNMP_K8S_GET: --url - # GENERATE_CLI_HELP: "true" + - os: ubuntu + dist: 20.04 + CI_KUBERNETES_VERSION: 1.29.0-alpha.1 + LNMP_K8S_GET: --url + GENERATE_CLI_HELP: "true" # current stable version - os: ubuntu @@ -544,6 +544,7 @@ jobs: export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH BASE_BRANCH=v1.29.0-alpha.1-config BASE_BRANCH=master + BASE_BRANCH=v1.28.0-config if [ $CI_KUBERNETES_VERSION != '1.29.0-alpha.1' ];then exit 0 fi From f52adb75fc1d041edd3173e9acf4b6f15a7ea2b1 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Fri, 6 Oct 2023 10:07:29 +0800 Subject: [PATCH 22/42] [Kubernetes] Test v1.29.0-alpha.1:update files [sync git] Signed-off-by: Kang Huaishuai --- kubernetes/.github/workflows/setup-k8s.yaml | 8 ++++---- kubernetes/CHANGELOG.md | 2 +- kubernetes/cfssl/Dockerfile | 3 +-- kubernetes/cfssl/kube-scheduler.config.yaml | 2 +- .../cli/config/kube-scheduler.config.yaml | 18 +++++++++--------- .../ignition/bu/ignition-local.example.bu | 2 +- .../ignition/bu/ignition-n.master.template.bu | 2 +- kubernetes/lnmp-k8s | 15 ++++++++------- .../mariadb/overlays/development/patch.json | 2 +- kubernetes/wsl2/00-README.MKFS.md | 1 + kubernetes/wsl2/00-README.SERVER.md | 10 ++++++---- .../wsl2/conf/kube-scheduler.config.yaml.temp | 2 +- 12 files changed, 35 insertions(+), 32 deletions(-) diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index 061198c51..249a5096f 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -96,10 +96,10 @@ jobs: dist: 20.04 CI_KUBERNETES_VERSION: 1.26.7 LNMP_K8S_GET: --url - - os: ubuntu - dist: 20.04 - CI_KUBERNETES_VERSION: 1.25.12 - LNMP_K8S_GET: --url + # - os: ubuntu + # dist: 20.04 + # CI_KUBERNETES_VERSION: 1.25.12 + # LNMP_K8S_GET: --url fail-fast: false steps: - uses: actions/checkout@v3 diff --git a/kubernetes/CHANGELOG.md b/kubernetes/CHANGELOG.md index 6e974e3d1..10541284e 100644 --- a/kubernetes/CHANGELOG.md +++ b/kubernetes/CHANGELOG.md @@ -6,7 +6,7 @@ ## v1.29.0 -* KubeSchedulerConfiguration v1beta3 is deprecated in v1.26, will be removed in v1.29 +* Kube-scheduler component config (`KubeSchedulerConfiguration`) `kubescheduler.config.k8s.io/v1beta3` is removed in v1.29. Migrate kube-scheduler configuration files to `kubescheduler.config.k8s.io/v1` ## v1.27.0 diff --git a/kubernetes/cfssl/Dockerfile b/kubernetes/cfssl/Dockerfile index 329c3b60a..939b1c90a 100644 --- a/kubernetes/cfssl/Dockerfile +++ b/kubernetes/cfssl/Dockerfile @@ -13,10 +13,9 @@ RUN set -x \ ; apk add --no-cache cfssl \ ; apk add --no-cache bash \ ; apk add --no-cache openssl \ - ; cp -a /usr/bin/cfssl /usr/bin/cfssljson /usr/local/bin \ ; curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl > /usr/local/bin/kubectl \ && apk del --no-network curl \ - && chmod +x /usr/local/bin/cfssl /usr/local/bin/cfssljson /usr/local/bin/kubectl + && chmod +x /usr/local/bin/kubectl WORKDIR /srv/cfssl diff --git a/kubernetes/cfssl/kube-scheduler.config.yaml b/kubernetes/cfssl/kube-scheduler.config.yaml index d4b4aca54..dca7c7f55 100644 --- a/kubernetes/cfssl/kube-scheduler.config.yaml +++ b/kubernetes/cfssl/kube-scheduler.config.yaml @@ -1,5 +1,5 @@ # https://github.com/kubernetes/kubernetes/blob/master/pkg/scheduler/apis/config/types.go -apiVersion: kubescheduler.config.k8s.io/v1beta3 +apiVersion: kubescheduler.config.k8s.io/v1 kind: KubeSchedulerConfiguration clientConnection: burst: 200 diff --git a/kubernetes/cli/config/kube-scheduler.config.yaml b/kubernetes/cli/config/kube-scheduler.config.yaml index d1c1c5d8e..b52de5b00 100644 --- a/kubernetes/cli/config/kube-scheduler.config.yaml +++ b/kubernetes/cli/config/kube-scheduler.config.yaml @@ -1,4 +1,4 @@ -apiVersion: kubescheduler.config.k8s.io/v1beta3 +apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: acceptContentTypes: "" burst: 200 @@ -23,22 +23,22 @@ podMaxBackoffSeconds: 10 profiles: - pluginConfig: - args: - apiVersion: kubescheduler.config.k8s.io/v1beta3 + apiVersion: kubescheduler.config.k8s.io/v1 kind: DefaultPreemptionArgs minCandidateNodesAbsolute: 100 minCandidateNodesPercentage: 10 name: DefaultPreemption - args: - apiVersion: kubescheduler.config.k8s.io/v1beta3 + apiVersion: kubescheduler.config.k8s.io/v1 hardPodAffinityWeight: 1 kind: InterPodAffinityArgs name: InterPodAffinity - args: - apiVersion: kubescheduler.config.k8s.io/v1beta3 + apiVersion: kubescheduler.config.k8s.io/v1 kind: NodeAffinityArgs name: NodeAffinity - args: - apiVersion: kubescheduler.config.k8s.io/v1beta3 + apiVersion: kubescheduler.config.k8s.io/v1 kind: NodeResourcesBalancedAllocationArgs resources: - name: cpu @@ -47,7 +47,7 @@ profiles: weight: 1 name: NodeResourcesBalancedAllocation - args: - apiVersion: kubescheduler.config.k8s.io/v1beta3 + apiVersion: kubescheduler.config.k8s.io/v1 kind: NodeResourcesFitArgs scoringStrategy: resources: @@ -58,7 +58,7 @@ profiles: type: LeastAllocated name: NodeResourcesFit - args: - apiVersion: kubescheduler.config.k8s.io/v1beta3 + apiVersion: kubescheduler.config.k8s.io/v1 kind: NodeResourcesLeastAllocatedArgs resources: - name: cpu @@ -67,12 +67,12 @@ profiles: weight: 1 name: NodeResourcesLeastAllocated - args: - apiVersion: kubescheduler.config.k8s.io/v1beta3 + apiVersion: kubescheduler.config.k8s.io/v1 defaultingType: System kind: PodTopologySpreadArgs name: PodTopologySpread - args: - apiVersion: kubescheduler.config.k8s.io/v1beta3 + apiVersion: kubescheduler.config.k8s.io/v1 bindTimeoutSeconds: 600 kind: VolumeBindingArgs name: VolumeBinding diff --git a/kubernetes/coreos/ignition/bu/ignition-local.example.bu b/kubernetes/coreos/ignition/bu/ignition-local.example.bu index 19ca18309..438aa9800 100644 --- a/kubernetes/coreos/ignition/bu/ignition-local.example.bu +++ b/kubernetes/coreos/ignition/bu/ignition-local.example.bu @@ -400,7 +400,7 @@ storage: mode: 0644 contents: inline: | - apiVersion: kubescheduler.config.k8s.io/v1beta3 + apiVersion: kubescheduler.config.k8s.io/v1 kind: KubeSchedulerConfiguration clientConnection: burst: 200 diff --git a/kubernetes/coreos/ignition/bu/ignition-n.master.template.bu b/kubernetes/coreos/ignition/bu/ignition-n.master.template.bu index ed9a94098..6a3cff995 100644 --- a/kubernetes/coreos/ignition/bu/ignition-n.master.template.bu +++ b/kubernetes/coreos/ignition/bu/ignition-n.master.template.bu @@ -423,7 +423,7 @@ storage: mode: 0644 contents: inline: | - apiVersion: kubescheduler.config.k8s.io/v1beta3 + apiVersion: kubescheduler.config.k8s.io/v1 kind: KubeSchedulerConfiguration clientConnection: burst: 200 diff --git a/kubernetes/lnmp-k8s b/kubernetes/lnmp-k8s index 06aa3b51b..35471a284 100755 --- a/kubernetes/lnmp-k8s +++ b/kubernetes/lnmp-k8s @@ -16,6 +16,7 @@ source ./.env.example source ./.env TMP_ROOT=$HOME/.khs1994-docker-lnmp/caches +GITHUB_MIRROR=download.fgit.ml ################################################################################ @@ -462,7 +463,7 @@ _gvisor_install(){ print_info "install gvisor(runsc) ..." local url_official="https://github.com/docker-practice/gvisor-mirror/releases/download/nightly" - local url="https://download.fgit.ml/docker-practice/gvisor-mirror/releases/download/nightly" + local url="https://${GITHUB_MIRROR}/docker-practice/gvisor-mirror/releases/download/nightly" local TAR_FILE="runsc-${GOOS}-${GOARCH}.tar.gz" if [ "$DOWNLOAD_FROM_CODING" != "false" ];then @@ -506,7 +507,7 @@ _runc_install(){ local file_name=runc.${GOARCH} local url_official=https://github.com/opencontainers/runc/releases/download/v${RUNC_VERSION} - local url=https://download.fgit.ml/opencontainers/runc/releases/download/v${RUNC_VERSION} + local url=https://${GITHUB_MIRROR}/opencontainers/runc/releases/download/v${RUNC_VERSION} if [ "$DOWNLOAD_FROM_CODING" != "false" ];then url=${CODING_URL}/${file_name}?version=${RUNC_VERSION} @@ -556,7 +557,7 @@ _crun_install(){ fi local file_name=crun-${CRUN_VERSION}-linux-${GOARCH} - local url=https://download.fgit.ml/containers/crun/releases/download/${CRUN_VERSION} + local url=https://${GITHUB_MIRROR}/containers/crun/releases/download/${CRUN_VERSION} local url_official=https://github.com/containers/crun/releases/download/${CRUN_VERSION} if [ "$DOWNLOAD_FROM_CODING" != "false" ];then @@ -569,7 +570,7 @@ _crun_install(){ $(_sudo) $(_curl) ${url} -o /usr/bin/crun file_name=crun-${CRUN_VERSION}-linux-${GOARCH}-disable-systemd - url=https://download.fgit.ml/containers/crun/releases/download/${CRUN_VERSION} + url=https://${GITHUB_MIRROR}/containers/crun/releases/download/${CRUN_VERSION} url_official=https://github.com/containers/crun/releases/download/${CRUN_VERSION} if [ "$DOWNLOAD_FROM_CODING" != "false" ];then @@ -611,7 +612,7 @@ _containerd_install(){ print_info "install containerd 1.7 ..." local url_official="https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}" - local url="https://download.fgit.ml/containerd/containerd/releases/download/v${CONTAINERD_VERSION}" + local url="https://${GITHUB_MIRROR}/containerd/containerd/releases/download/v${CONTAINERD_VERSION}" local TAR_FILE="cri-containerd-${CONTAINERD_VERSION}-${GOOS}-${GOARCH}.tar.gz" @@ -733,7 +734,7 @@ _crictl_install(){ fi local url_official="https://github.com/kubernetes-sigs/cri-tools/releases/download/v${CRICTL_VERSION}" - local url="https://download.fgit.ml/kubernetes-sigs/cri-tools/releases/download/v${CRICTL_VERSION}" + local url="https://${GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${CRICTL_VERSION}" local TAR_FILE="crictl-v${CRICTL_VERSION}-linux-${GOARCH}.tar.gz" if [ "$DOWNLOAD_FROM_CODING" != "false" ];then @@ -841,7 +842,7 @@ _conmon_install(){ fi local url_official=https://github.com/containers/conmon/releases/download/v${CONMON_VERSION}/conmon.$GOARCH - local url=https://download.fgit.ml/containers/conmon/releases/download/v${CONMON_VERSION}/conmon.$GOARCH + local url=https://${GITHUB_MIRROR}/containers/conmon/releases/download/v${CONMON_VERSION}/conmon.$GOARCH if [ $DOWNLOAD_FROM_CODING != "false" ];then url=$CODING_URL/conmon.$GOARCH?version=${CONMON_VERSION} diff --git a/kubernetes/lnmp/mariadb/overlays/development/patch.json b/kubernetes/lnmp/mariadb/overlays/development/patch.json index 1967127a0..60f0aacb0 100644 --- a/kubernetes/lnmp/mariadb/overlays/development/patch.json +++ b/kubernetes/lnmp/mariadb/overlays/development/patch.json @@ -2,7 +2,7 @@ { "op": "replace", "path": "/spec/template/spec/containers/0/image", - "value": "mariadb:10.11.3" + "value": "mariadb:10.11.5" }, { "op": "remove", diff --git a/kubernetes/wsl2/00-README.MKFS.md b/kubernetes/wsl2/00-README.MKFS.md index 403fad000..66f84c2a0 100644 --- a/kubernetes/wsl2/00-README.MKFS.md +++ b/kubernetes/wsl2/00-README.MKFS.md @@ -3,6 +3,7 @@ 如果硬盘不存在 `ext4` 分区，先在 Windows 磁盘管理中分出一个未分配卷（可以从一个分区中压缩出一个，然后在未分配卷中点击右键选择[新建简单卷]，选择 [不要格式化这个卷]）。然后挂载整块硬盘到 `WSL2`。 ```bash +$ wmic diskdrive list brief # 请将 PHYSICALDRIVE 替换为具体的值 $ wsl --mount \\.\PHYSICALDRIVE1 --bare ``` diff --git a/kubernetes/wsl2/00-README.SERVER.md b/kubernetes/wsl2/00-README.SERVER.md index 3d1196195..f7ec52c20 100644 --- a/kubernetes/wsl2/00-README.SERVER.md +++ b/kubernetes/wsl2/00-README.SERVER.md @@ -185,12 +185,14 @@ $env:CFSSL_ROOTFS="/wsl/wsl-k8s-data/cfssl/rootfs" $ wsl -d wsl-k8s -- sh -xc 'mkdir ${CFSSL_ROOT:?err}' $ . ../windows/sdk/dockerhub/rootfs -# 该命令执行结果最后一行会给出<文件地址> -$ rootfs khs1994-docker/khs1994/k8s-cfssl -ref latest -registry pcit-docker.pkg.coding.net -$ cp <文件地址> \\wsl$\wsl-k8s\"${env:CFSSL_ROOTFS}".tar.gz +$ foreach($item in 0,1,2,3,4){ ` + $tar_gz_file=rootfs khs1994-docker/khs1994/k8s-cfssl ` + -ref latest -registry pcit-docker.pkg.coding.net -layersIndex $item ; ` + cp $tar_gz_file \\wsl$\wsl-k8s\"${env:CFSSL_ROOTFS}${item}".tar.gz + } $ wsl -d wsl-k8s -- sh -xc 'mkdir ${CFSSL_ROOTFS:?err}' -$ wsl -d wsl-k8s -- sh -xc 'tar -C ${CFSSL_ROOTFS:?err} -zxvf ${CFSSL_ROOTFS:?err}.tar.gz' +$ wsl -d wsl-k8s -- sh -xc 'for tar in ${CFSSL_ROOT:?err}/*.tar.gz ; do tar -C ${CFSSL_ROOTFS:?err} -zxvf \$tar;done' $ wsl -d wsl-k8s -- sh -xc 'cp wsl2/cfssl/config.json ${CFSSL_ROOT:?err}/' $ wsl -d wsl-k8s -- bash -xc 'cp wsl2/{.env,.env.example} cfssl/{docker-entrypoint.sh,kube-scheduler.config.yaml} ${CFSSL_ROOTFS:?err}/' diff --git a/kubernetes/wsl2/conf/kube-scheduler.config.yaml.temp b/kubernetes/wsl2/conf/kube-scheduler.config.yaml.temp index 3afc4322e..d7b2b7154 100644 --- a/kubernetes/wsl2/conf/kube-scheduler.config.yaml.temp +++ b/kubernetes/wsl2/conf/kube-scheduler.config.yaml.temp @@ -1,5 +1,5 @@ # https://github.com/kubernetes/kubernetes/blob/master/pkg/scheduler/apis/config/types.go -apiVersion: kubescheduler.config.k8s.io/v1beta3 +apiVersion: kubescheduler.config.k8s.io/v1 kind: KubeSchedulerConfiguration clientConnection: burst: 200 From f4e878a8e080f8afd067c83f2c5d5282b4661be1 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Fri, 6 Oct 2023 21:13:50 +0800 Subject: [PATCH 23/42] Update url Signed-off-by: Kang Huaishuai --- .env.example | 3 +- .../setup-docker/.github/workflows/ci.yaml | 1 + .gitignore | 2 + README.cn.md | 11 ++++- README.md | 11 ++++- app/demo/.env.example | 2 +- app/demo/Dockerfile | 2 +- app/demo/docker-compose.yml | 2 +- app/demo/docker-workspace.yml | 2 +- app/laravel-demo/Dockerfile | 4 +- app/laravel-demo/Dockerfile.buildkit | 4 +- app/laravel-demo/Dockerfile.cdn | 2 +- bin/.init | 2 +- bin/lnmp-laravel | 2 +- bin/lnmp-mysql | 2 +- bin/lnmp-npm | 2 +- config/etc/hosts | 20 +++++++-- docker-production.yml | 4 +- docker-workspace.example.yml | 2 +- dockerfile/sync/docker-image-sync.json | 44 +++++++++++-------- docs/laravel.md | 5 ++- docs/network.md | 13 ------ docs/ssh.md | 6 +++ lnmp-docker | 2 +- lnmp-docker.ps1 | 13 ++++++ lrew/mariadb/.env.compose | 2 +- lrew/mariadb/docker-compose.yml | 2 +- lrew/mariadb/example.Dockerfile | 2 +- scripts/docker-compose.bump.yml | 10 ++++- vscode-remote/docker-workspace.yml | 2 +- windows/lnmp-windows-pm-repo/7zip/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/adb/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/cfssl/lwpm.json | 2 +- .../lnmp-windows-pm-repo/compose/lwpm.json | 2 +- .../lnmp-windows-pm-repo/compose/lwpm.yaml | 2 +- .../lnmp-windows-pm-repo/coredns/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/deno/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/dive/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/etcher/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/etcher/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/frp/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/gh/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/jx/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/jx/lwpm.yaml | 2 +- .../lnmp-windows-pm-repo/k8s/conmon/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/conmon/lwpm.yml | 2 +- .../k8s/containerd/lwpm.json | 2 +- .../k8s/containerd/lwpm.yml | 2 +- .../lnmp-windows-pm-repo/k8s/crictl/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/crictl/lwpm.yml | 2 +- .../k8s/istioctl/lwpm.json | 2 +- .../k8s/istioctl/lwpm.yaml | 2 +- .../lnmp-windows-pm-repo/k8s/runc/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/runc/lwpm.yml | 2 +- .../lnmp-windows-pm-repo/k8s/runsc/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/runsc/lwpm.yml | 2 +- .../lnmp-windows-pm-repo/mariadb/lwpm.json | 8 ++-- .../lnmp-windows-pm-repo/mariadb/lwpm.yaml | 12 +++-- windows/lnmp-windows-pm-repo/node/lwpm.json | 4 +- .../php-cgi-spawner/lwpm.json | 2 +- .../php-cgi-spawner/lwpm.yaml | 2 +- .../php-cs-fixer/lwpm.json | 2 +- .../php-igbinary/lwpm.json | 2 +- .../php-igbinary/lwpm.yaml | 2 +- .../php-mongodb/lwpm.json | 2 +- .../php-mongodb/lwpm.yaml | 2 +- .../lnmp-windows-pm-repo/php-redis/lwpm.json | 2 +- .../lnmp-windows-pm-repo/php-redis/lwpm.yaml | 2 +- .../lnmp-windows-pm-repo/php-xdebug/lwpm.json | 2 +- .../lnmp-windows-pm-repo/php-xdebug/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/pwsh/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/s6/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/s6/lwpm.yaml | 2 +- windows/lnmp-windows-pm-repo/vclib/lwpm.json | 6 +-- windows/lnmp-windows-pm-repo/vim/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/zeal/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/zstd/lwpm.json | 2 +- windows/lnmp-windows-pm.ps1 | 2 + wsl/lnmp-wsl-install | 2 +- wsl2/bin/kernel.ps1 | 6 +-- wsl2/kernel.next.version | 2 +- wsl2/kernel.version | 2 +- 82 files changed, 185 insertions(+), 130 deletions(-) diff --git a/.env.example b/.env.example index 8cad840c0..f2b1d256d 100644 --- a/.env.example +++ b/.env.example @@ -149,7 +149,7 @@ LNMP_MEMCACHED_VERSION=1.6.15 LNMP_PHPMYADMIN_VERSION=5.2.0 -LNMP_NODE_VERSION=18.2.0 +LNMP_NODE_VERSION=20.5.1 # [CONF FILE NAME] # @@ -171,7 +171,6 @@ LNMP_NODE_VERSION=18.2.0 LNMP_DOCKER_IMAGE_PREFIX=khs1994 # LNMP_DOCKER_IMAGE_PREFIX=lrew -# LNMP_DOCKER_IMAGE_PREFIX=ccr.ccs.tencentyun.com/khs1994 # LNMP_DOCKER_IMAGE_PREFIX=ccr.ccs.tencentyun.com/your-company # LNMP_DOCKER_IMAGE_PREFIX=pcit-docker.pkg.coding.net/khs1994-docker/khs1994 diff --git a/.github/actions/setup-docker/.github/workflows/ci.yaml b/.github/actions/setup-docker/.github/workflows/ci.yaml index f2230b89b..e1e5cd7ef 100644 --- a/.github/actions/setup-docker/.github/workflows/ci.yaml +++ b/.github/actions/setup-docker/.github/workflows/ci.yaml @@ -31,6 +31,7 @@ jobs: - ubuntu-22.04 - ubuntu-latest - macos-13 + # - macos-13-xlarge include: # macOS - os: macos-latest diff --git a/.gitignore b/.gitignore index 62ada1ebc..d5b8b0471 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,5 @@ lwpm.lock.json /.docker .patch + +*.msi diff --git a/README.cn.md b/README.cn.md index 624a580ef..c2c252f3e 100644 --- a/README.cn.md +++ b/README.cn.md @@ -1,5 +1,14 @@ # LNMP Docker +## 由于 Docker 镜像默认地址国内访问不畅，请进行如下配置 + +`.env` 文件增加如下内容 + +```bash +LNMP_DOCKER_IMAGE_PREFIX=pcit-docker.pkg.coding.net/khs1994-docker/khs1994 +LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror +``` + [![GitHub stars](https://img.shields.io/github/stars/khs1994-docker/lnmp.svg?style=social&label=Stars)](https://github.com/khs1994-docker/lnmp) [![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)](https://github.com/khs1994-docker/lnmp/releases) [![license](https://img.shields.io/github/license/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp) [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) [![star](https://gitee.com/khs1994-docker/lnmp/badge/star.svg?theme=dark)](https://gitee.com/khs1994-docker/lnmp/stargazers) @@ -205,7 +214,7 @@ $ ./lnmp-docker down |[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.5-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| -|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.3` | **10.11.3** |`ubuntu:jammy` | +|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.5` | **10.11.5** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | |[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.5-fpm-alpine` | **8.2.5** |`alpine:3.16` | |[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.5-composer-alpine`| **2.5.8** |`alpine:3.16` | diff --git a/README.md b/README.md index 9127a8e19..05438458f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,14 @@ # LNMP Docker +## 由于 Docker 镜像默认地址国内访问不畅，请进行如下配置 + +`.env` 文件增加如下内容 + +```bash +LNMP_DOCKER_IMAGE_PREFIX=pcit-docker.pkg.coding.net/khs1994-docker/khs1994 +LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror +``` + [![GitHub stars](https://img.shields.io/github/stars/khs1994-docker/lnmp.svg?style=social&label=Stars)](https://github.com/khs1994-docker/lnmp) [![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)](https://github.com/khs1994-docker/lnmp/releases) [![license](https://img.shields.io/github/license/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp) [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) [![star](https://gitee.com/khs1994-docker/lnmp/badge/star.svg?theme=dark)](https://gitee.com/khs1994-docker/lnmp/stargazers) @@ -200,7 +209,7 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.5-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| -|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.3` | **10.11.3** |`ubuntu:jammy` | +|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.5` | **10.11.5** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | |[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.5-fpm-alpine` | **8.2.5** |`alpine:3.16` | |[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.5-composer-alpine`| **2.5.8** |`alpine:3.16` | diff --git a/app/demo/.env.example b/app/demo/.env.example index 1f55a8d69..14eed6e57 100644 --- a/app/demo/.env.example +++ b/app/demo/.env.example @@ -10,4 +10,4 @@ PHP_VERSION=8.2.5 # PHP_VERSION=7.0.33 # PHP_VERSION=5.6.40 -NODE_VERSION=18.2.0 +NODE_VERSION=20.5.1 diff --git a/app/demo/Dockerfile b/app/demo/Dockerfile index fa01f5fda..cb8fa0d70 100644 --- a/app/demo/Dockerfile +++ b/app/demo/Dockerfile @@ -8,7 +8,7 @@ # # !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !! -ARG NODE_VERSION=18.2.0 +ARG NODE_VERSION=20.5.1 ARG PHP_VERSION=8.2.5 ARG NGINX_VERSION=1.15.0 ARG DOCKER_HUB_USERNAME=khs1994 diff --git a/app/demo/docker-compose.yml b/app/demo/docker-compose.yml index 60d3482ec..9bcd72a3c 100644 --- a/app/demo/docker-compose.yml +++ b/app/demo/docker-compose.yml @@ -40,6 +40,6 @@ services: target: php args: - PHP_VERSION=${PHP_VERSION:-8.2.5} - - NODE_VERSION=${NODE_VERSION:-18.2.0} + - NODE_VERSION=${NODE_VERSION:-20.5.1} - NODE_REGISTRY=https://registry.npmmirror.com image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.5}-pro-alpine diff --git a/app/demo/docker-workspace.yml b/app/demo/docker-workspace.yml index 4ab4d5682..a0e699a4d 100644 --- a/app/demo/docker-workspace.yml +++ b/app/demo/docker-workspace.yml @@ -74,7 +74,7 @@ services: << : - *workspace - *common - image: node:18.2.0-alpine + image: node:20.5.1-alpine entrypoint: npm command: [] # install | "run","dev" | diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index 0430b1578..4cf5eaf5a 100644 --- a/app/laravel-demo/Dockerfile +++ b/app/laravel-demo/Dockerfile @@ -13,7 +13,7 @@ # # $ docker build --target=laravel -t khs1994/laravel:10 --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . -ARG NODE_VERSION=18.2.0 +ARG NODE_VERSION=20.5.1 ARG PHP_VERSION=8.2.5 ARG NGINX_VERSION=1.25.1-alpine ARG DOCKER_HUB_USERNAME=khs1994 @@ -40,7 +40,7 @@ RUN set -x ; cd /app \ --optimize-autoloader # 1.前端构建 -FROM node:${NODE_VERSION:-18.2.0}-alpine as frontend +FROM node:${NODE_VERSION:-20.5.1}-alpine as frontend ARG NODE_REGISTRY=https://registry.npmjs.org diff --git a/app/laravel-demo/Dockerfile.buildkit b/app/laravel-demo/Dockerfile.buildkit index 9af4f2148..bc6c73ee3 100644 --- a/app/laravel-demo/Dockerfile.buildkit +++ b/app/laravel-demo/Dockerfile.buildkit @@ -15,7 +15,7 @@ # # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.buildkit --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . -ARG NODE_VERSION=18.2.0 +ARG NODE_VERSION=20.5.1 ARG PHP_VERSION=8.2.5 ARG NGINX_VERSION=1.25.1-alpine ARG DOCKER_HUB_USERNAME=khs1994 @@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/tmp,id=laravel_caches \ --optimize-autoloader # 1.前端构建 -FROM node:${NODE_VERSION:-18.2.0}-alpine as frontend +FROM node:${NODE_VERSION:-20.5.1}-alpine as frontend ARG NODE_REGISTRY=https://registry.npmjs.org diff --git a/app/laravel-demo/Dockerfile.cdn b/app/laravel-demo/Dockerfile.cdn index f2323f08c..c6e667237 100644 --- a/app/laravel-demo/Dockerfile.cdn +++ b/app/laravel-demo/Dockerfile.cdn @@ -42,7 +42,7 @@ RUN --mount=type=cache,target=/tmp,id=laravel_caches \ --optimize-autoloader # 1.前端构建，并上传到 CDN -FROM node:${NODE_VERSION:-18.2.0}-alpine as frontend +FROM node:${NODE_VERSION:-20.5.1}-alpine as frontend ARG NODE_REGISTRY=https://registry.npmjs.org diff --git a/bin/.init b/bin/.init index ed2b82367..dc46ca6fb 100644 --- a/bin/.init +++ b/bin/.init @@ -18,7 +18,7 @@ export ARCH=`uname -m` VERSION=${LNMP_PHP_VERSION} -export LNMP_PHP_IMAGE=khs1994/php +export LNMP_PHP_IMAGE=${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php export LNMP_PHP_IMAGE_TAG=${VERSION}-composer-alpine diff --git a/bin/lnmp-laravel b/bin/lnmp-laravel index 9def19d0e..99b0edc5b 100755 --- a/bin/lnmp-laravel +++ b/bin/lnmp-laravel @@ -41,7 +41,7 @@ docker run -i ${tty} --rm \ " if [ "$LNMP_CN_ENV" = 'false' ];then - sed -i 's!https://mirrors.aliyun.com/composer/!https://repo.packagist.org!g' \ + sudo sed -i 's!https://mirrors.aliyun.com/composer/!https://repo.packagist.org!g' \ $ScriptRoot/../config/composer/config.json fi diff --git a/bin/lnmp-mysql b/bin/lnmp-mysql index 2f90a6a68..1b76e55cc 100755 --- a/bin/lnmp-mysql +++ b/bin/lnmp-mysql @@ -20,7 +20,7 @@ if [ "$debug" = 'true' ];then set -x; fi image=mysql:${LNMP_MYSQL_VERSION:-8.0.33} if ! [ $(uname -s) = 'x86_64' ];then - image=mariadb:${LNMP_MARIADB_VERSION:-10.11.3} + image=mariadb:${LNMP_MARIADB_VERSION:-10.11.5} fi exec docker run -i ${tty} --rm \ diff --git a/bin/lnmp-npm b/bin/lnmp-npm index 45b936954..d4fd401a6 100755 --- a/bin/lnmp-npm +++ b/bin/lnmp-npm @@ -41,5 +41,5 @@ exec docker run -i ${tty} --rm \ --entrypoint npm \ --user ${LNMP_USER:-root:root} \ --network $network \ - ${LNMP_NODE_IMAGE:-node:alpine} \ + ${LNMP_NODE_IMAGE:-${ccr.ccs.tencentyun.com/library-mirror:-library}/node:alpine} \ "$@" diff --git a/config/etc/hosts b/config/etc/hosts index 33cb79a5b..b0cbd077d 100644 --- a/config/etc/hosts +++ b/config/etc/hosts @@ -2,10 +2,24 @@ 140.82.114.6 api.github.com 151.101.129.69 cdn.sstatic.net -52.216.185.147 github-cloud.s3.amazonaws.com -52.217.16.124 github-production-release-asset-2e65be.s3.amazonaws.com 199.232.69.194 github.global.ssl.fastly.net +# https://api.github.com/meta # 140.82.114.3 +# 20.205.243.166 +# 192.30.252.0 +# 185.199.108.0 +# 140.82.112.0 +# 143.55.64.0 +# 2a0a:a440:: +# 2606:50c0:: +# 20.201.28.151 +# 20.87.225.212 +# 20.248.137.48 +# 20.207.73.82 +# 20.27.177.113 +# 20.200.245.247 +# 20.175.192.147 +# 20.233.83.145 140.82.112.4 github.com gist.github.com 199.232.68.133 avatars1.githubusercontent.com avatars2.githubusercontent.com 199.232.68.133 avatars0.githubusercontent.com avatars3.githubusercontent.com @@ -14,7 +28,7 @@ 216.58.199.16 storage.googleapis.com 140.82.112.10 codeload.github.com 199.232.68.133 raw.githubusercontent.com - +185.199.109.133 objects.githubusercontent.com 172.217.174.209 proxy.golang.org 140.82.114.34 pkg.github.com diff --git a/docker-production.yml b/docker-production.yml index 04f4a9d1f..ace23be32 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -159,9 +159,9 @@ services: # << : *default-build-debian # context: ./dockerfile/mariadb/ # dockerfile: Dockerfile - # image: "mariadb:10.11.3" + # image: "mariadb:10.11.5" # # image: username/lnmp-mariadb:tag - # # image: khs1994/lnmp-mariadb:10.11.3 + # # image: khs1994/lnmp-mariadb:10.11.5 # environment: # MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_root_password # MYSQL_DATABASE: test diff --git a/docker-workspace.example.yml b/docker-workspace.example.yml index b71ebb3d0..c9bdd35ee 100644 --- a/docker-workspace.example.yml +++ b/docker-workspace.example.yml @@ -78,7 +78,7 @@ services: << : - *workspace - *common - image: node:${LNMP_NODE_VERSION:-18.2.0}-alpine + image: node:${LNMP_NODE_VERSION:-20.5.1}-alpine entrypoint: npm command: [] # install | ["run","dev"] | diff --git a/dockerfile/sync/docker-image-sync.json b/dockerfile/sync/docker-image-sync.json index 1ca38e0c8..87a6db67e 100644 --- a/dockerfile/sync/docker-image-sync.json +++ b/dockerfile/sync/docker-image-sync.json @@ -8,12 +8,12 @@ "dest": "library-mirror/node:alpine" }, { - "source": "node:18.2.0-alpine", - "dest": "library-mirror/node:18.2.0-alpine" + "source": "node:20.5.1-alpine", + "dest": "library-mirror/node:20.5.1-alpine" }, { - "source": "node:16.15.0-alpine", - "dest": "library-mirror/node:16.15.0-alpine" + "source": "node:18.17.1-alpine", + "dest": "library-mirror/node:18.17.1-alpine" }, { "source": "golang:1.20.1-alpine", @@ -47,6 +47,14 @@ "source": "library/alpine:3.16", "dest": "library-mirror/alpine:3.16" }, + { + "source": "library/alpine:3.17", + "dest": "library-mirror/alpine:3.16" + }, + { + "source": "library/alpine:3.18", + "dest": "library-mirror/alpine:3.16" + }, { "source": "library/alpine:edge", "dest": "library-mirror/alpine:edge" @@ -67,41 +75,41 @@ "source": "library/mysql:latest", "dest": "library-mirror/mysql:latest" }, - { - "source": "library/mysql:8.0.33", - "dest": "library-mirror/mysql:8.0.33" - }, { "source": "library/mysql:5.7.33", "dest": "library-mirror/mysql:5.7.33" }, { - "source": "library/mysql:5.6.51", - "dest": "library-mirror/mysql:5.6.51" + "source": "library/mysql:8.0.33", + "dest": "library-mirror/mysql:8.0.33" + }, + { + "source": "library/mysql:8.1.0", + "dest": "library-mirror/mysql:8.1.0" }, { "source": "library/mariadb:latest", "dest": "library-mirror/mariadb:latest" }, { - "source": "library/mariadb:10.11.3", - "dest": "library-mirror/mariadb:10.11.3" + "source": "library/mariadb:10.10.6", + "dest": "library-mirror/mariadb:10.10.6" }, { - "source": "library/mariadb:10.7.4", - "dest": "library-mirror/mariadb:10.7.4" + "source": "library/mariadb:10.11.5", + "dest": "library-mirror/mariadb:10.11.5" }, { - "source": "library/mariadb:10.6.8", - "dest": "library-mirror/mariadb:10.6.8" + "source": "library/mariadb:11.0.3", + "dest": "library-mirror/mariadb:11.0.3" }, { "source": "library/registry:latest", "dest": "library-mirror/registry:latest" }, { - "source": "library/registry:2.7.1", - "dest": "library-mirror/registry:2.7.1" + "source": "library/registry:2.8.2", + "dest": "library-mirror/registry:2.8.2" }, { "source": "library/mongo:latest", diff --git a/docs/laravel.md b/docs/laravel.md index 80349e125..9ff7a83a7 100644 --- a/docs/laravel.md +++ b/docs/laravel.md @@ -97,8 +97,9 @@ $ cd ~/lnmp/bin $ $env:WSLENV="LNMP_BIN_WIN_PATH/p" $ $env:LNMP_BIN_WIN_PATH=$PWD -$ wsl -d -- sh -c 'echo $LNMP_BIN_WIN_PATH' -# 将结果追加到 WSL2 中的 PATH 环境变量中 +$ wsl -d -- sh -c 'echo PATH=\\\$PATH:$LNMP_BIN_WIN_PATH >> ~/.bashrc; tail ~/.bashrc' + +# $ sudo usermod -aG docker $USER ``` **以上步骤仅需执行一次，后续开发从以下步骤开始** diff --git a/docs/network.md b/docs/network.md index 45bf32f90..08159288b 100644 --- a/docs/network.md +++ b/docs/network.md @@ -4,19 +4,6 @@ > 可以尝试自定义 [hosts](https://github.com/khs1994-docker/lnmp/blob/master/config/etc/hosts) -* https://doc.fastgit.org/en-gb/guide.html#the-usage-of-web - -```bash -# https://github.com/author/repo -$ git clone https://hub.fastgit.org/author/repo - -# https://github.com/A/A/releases/download/1.0/1.0.tar.gz -$ wget https://download.fgit.ml/A/A/releases/download/1.0/1.0.tar.gz - -# https://raw.githubusercontent.com/ -# https://raw.fastgit.org/ -``` - * 官方默认的 `apt` 镜像 * `pecl` diff --git a/docs/ssh.md b/docs/ssh.md index 5d9ac3f87..783e8ae2e 100644 --- a/docs/ssh.md +++ b/docs/ssh.md @@ -1,5 +1,11 @@ # SSH +## 生成密钥 + +```bash +$ ssh-keygen -t rsa +``` + ## 错误 ```bash diff --git a/lnmp-docker b/lnmp-docker index 8cf24653c..0b9d31b1e 100755 --- a/lnmp-docker +++ b/lnmp-docker @@ -1580,7 +1580,7 @@ fi if [ ${OS} = "Darwin" ];then /usr/bin/sed -i "" "s/^LNMP_DOCKER_VERSION.*/LNMP_DOCKER_VERSION=${LNMP_DOCKER_VERSION}/g" $LNMP_ENV_FILE else - sed -i "s/^LNMP_DOCKER_VERSION.*/LNMP_DOCKER_VERSION=${LNMP_DOCKER_VERSION}/g" $LNMP_ENV_FILE + sed -i "s/^LNMP_DOCKER_VERSION.*/LNMP_DOCKER_VERSION=${LNMP_DOCKER_VERSION}/g" $LNMP_ENV_FILE || true fi print_info "ARCH is ${OS} ${ARCH}" diff --git a/lnmp-docker.ps1 b/lnmp-docker.ps1 index 1e0ef9ace..c80556413 100755 --- a/lnmp-docker.ps1 +++ b/lnmp-docker.ps1 @@ -1371,6 +1371,19 @@ Example: ./lnmp-docker composer /app/demo install wsl -d $WSL2_DIST -u root -- sh -cx "mkdir -p ${wsl2_mount_physicaldiskdevice_path}${WSL2_DIST_PATH}" wsl -d $WSL2_DIST -u root -- sh -cx "mount --bind ${wsl2_mount_physicaldiskdevice_path}${WSL2_DIST_PATH} $WSL2_DIST_PATH" wsl -d $WSL2_DIST -u root -- sh -cx "chown 1000:1000 $WSL2_DIST_PATH" + $WSL2_DIST_USER=$(wsl -d ubuntu-22.04 -- sh -c 'echo $USER') + + wsl -d $WSL2_DIST -u root -- sh -cx "mkdir -p /home/$WSL2_DIST_USER/.cache/JetBrains" + wsl -d $WSL2_DIST -u root -- sh -cx "mkdir -p ${wsl2_mount_physicaldiskdevice_path}/home/$WSL2_DIST_USER/.cache/JetBrains" + wsl -d $WSL2_DIST -u root -- sh -cx "chown -R ${WSL2_DIST_USER}:${WSL2_DIST_USER} /home/$WSL2_DIST_USER/.cache/JetBrains" + wsl -d $WSL2_DIST -u root -- sh -cx "chown -R ${WSL2_DIST_USER}:${WSL2_DIST_USER} ${wsl2_mount_physicaldiskdevice_path}/home/$WSL2_DIST_USER/.cache/JetBrains" + wsl -d $WSL2_DIST -u root -- sh -cx "mount --bind ${wsl2_mount_physicaldiskdevice_path}/home/$WSL2_DIST_USER/.cache/JetBrains /home/$WSL2_DIST_USER/.cache/JetBrains" + + wsl -d $WSL2_DIST -u root -- sh -cx "mkdir -p /home/$WSL2_DIST_USER/.vscode-server" + wsl -d $WSL2_DIST -u root -- sh -cx "mkdir -p ${wsl2_mount_physicaldiskdevice_path}/home/$WSL2_DIST_USER/.vscode-server" + wsl -d $WSL2_DIST -u root -- sh -cx "chown -R ${WSL2_DIST_USER}:${WSL2_DIST_USER} /home/$WSL2_DIST_USER/.vscode-server" + wsl -d $WSL2_DIST -u root -- sh -cx "chown -R ${WSL2_DIST_USER}:${WSL2_DIST_USER} ${wsl2_mount_physicaldiskdevice_path}/home/$WSL2_DIST_USER/.vscode-server" + wsl -d $WSL2_DIST -u root -- sh -cx "mount --bind ${wsl2_mount_physicaldiskdevice_path}/home/$WSL2_DIST_USER/.vscode-server /home/$WSL2_DIST_USER/.vscode-server" } "^code$" { diff --git a/lrew/mariadb/.env.compose b/lrew/mariadb/.env.compose index c2590170e..9210c0170 100644 --- a/lrew/mariadb/.env.compose +++ b/lrew/mariadb/.env.compose @@ -1,5 +1,5 @@ # 请在 khs1994-docker/lnmp 的 .env 文件中(例如`~/lnmp/.env`)写入以下变量 -LNMP_MARIADB_VERSION=10.11.3 +LNMP_MARIADB_VERSION=10.11.5 # LNMP_MARIADB_DATA=/var/lib/mysql-my diff --git a/lrew/mariadb/docker-compose.yml b/lrew/mariadb/docker-compose.yml index cfcb467bf..b64f3ed3a 100644 --- a/lrew/mariadb/docker-compose.yml +++ b/lrew/mariadb/docker-compose.yml @@ -21,7 +21,7 @@ services: << : - *common - *common-label - image: "${LNMP_LIBRARY_NS:-library}/mariadb:${LNMP_MARIADB_VERSION:-10.11.3}" + image: "${LNMP_LIBRARY_NS:-library}/mariadb:${LNMP_MARIADB_VERSION:-10.11.5}" environment: # @link https://github.com/docker-library/docs/tree/master/mariadb#environment-variables MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_root_password diff --git a/lrew/mariadb/example.Dockerfile b/lrew/mariadb/example.Dockerfile index 9a307990b..5f0af5967 100644 --- a/lrew/mariadb/example.Dockerfile +++ b/lrew/mariadb/example.Dockerfile @@ -1,4 +1,4 @@ -FROM mariadb:10.11.3 +FROM mariadb:10.11.5 LABEL maintainer="khs1994-docker/lnmp " diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index 489e7b27f..904dc3a48 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -5,7 +5,7 @@ services: image: mysql:8.0.33 mariadb: - image: mariadb:10.11.3 + image: mariadb:10.11.5 redis: image: redis:7.0.0-alpine @@ -47,7 +47,7 @@ services: image: kong:2.8.1-alpine node: - image: node:18.2.0-alpine + image: node:20.5.1-alpine go: image: golang:1.20.1-alpine @@ -72,3 +72,9 @@ services: acme.sh: image: neilpang/acme.sh:3.0.0 + + powershell: + image: + + powershell-preview: + image: diff --git a/vscode-remote/docker-workspace.yml b/vscode-remote/docker-workspace.yml index 7fdf6781c..1300250c9 100644 --- a/vscode-remote/docker-workspace.yml +++ b/vscode-remote/docker-workspace.yml @@ -75,7 +75,7 @@ services: << : - *workspace - *common - image: node:18.2.0-alpine + image: node:20.5.1-alpine entrypoint: npm command: [] # install | "run","dev" | diff --git a/windows/lnmp-windows-pm-repo/7zip/lwpm.json b/windows/lnmp-windows-pm-repo/7zip/lwpm.json index a399dbb4c..cbc7d185a 100644 --- a/windows/lnmp-windows-pm-repo/7zip/lwpm.json +++ b/windows/lnmp-windows-pm-repo/7zip/lwpm.json @@ -1,8 +1,8 @@ { "name": "7zip", "description": "7-Zip is a file archiver with a high compression ratio", - "version": "2201", - "pre-version": "2300", + "version": "2301", + "pre-version": "2301", "homepage": "https://www.7-zip.org/", "bug": "https://www.7-zip.org/support.html", "github": "", diff --git a/windows/lnmp-windows-pm-repo/adb/lwpm.json b/windows/lnmp-windows-pm-repo/adb/lwpm.json index ed1662647..e6f228639 100644 --- a/windows/lnmp-windows-pm-repo/adb/lwpm.json +++ b/windows/lnmp-windows-pm-repo/adb/lwpm.json @@ -13,7 +13,7 @@ "pre-url-mirror": "", "command": "adb", "download-filename": "", - "winget-pkgs": "https://hub.fgit.ml/microsoft/winget-pkgs/tree/master/manifests/g/Google/PlatformTools", + "winget-pkgs": "https://hub.nuaa.cf/microsoft/winget-pkgs/tree/master/manifests/g/Google/PlatformTools", "scripts": { "preinstall": [ "# _cleanup \"$unzipDesc\"" diff --git a/windows/lnmp-windows-pm-repo/cfssl/lwpm.json b/windows/lnmp-windows-pm-repo/cfssl/lwpm.json index ed7693285..a5f2a7c81 100644 --- a/windows/lnmp-windows-pm-repo/cfssl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/cfssl/lwpm.json @@ -6,7 +6,7 @@ ], "releases": "https://github.com/cloudflare/cfssl/releases", "scripts": { - "install": "$url = \"https://download.fgit.ml/cloudflare/cfssl/releases/download/v${VERSION}\"\n$pkgs='cfssl','cfssl-bundle','cfssl-certinfo','cfssl-newkey','cfssl-scan','cfssljson','mkbundle','multirootca'\nforeach($pkg in $pkgs){\n printInfo Downloading $pkg ...\n\n if($_isWindows){\n $dist=\"C:\\bin\\${pkg}.exe\"\n }else{\n $dist=\"/usr/local/bin/${pkg}\"\n }\n\n if(Test-Path $dist){\n printTips $pkg exists`, skip\n continue;\n }\n\n if($_isWindows){\n curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist\n }else{\n sudo curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist\n sudo chmod +x $dist\n }\n\n}\n", + "install": "$url = \"https://${env:GITHUB_MIRROR}/cloudflare/cfssl/releases/download/v${VERSION}\"\n$pkgs='cfssl','cfssl-bundle','cfssl-certinfo','cfssl-newkey','cfssl-scan','cfssljson','mkbundle','multirootca'\nforeach($pkg in $pkgs){\n printInfo Downloading $pkg ...\n\n if($_isWindows){\n $dist=\"C:\\bin\\${pkg}.exe\"\n }else{\n $dist=\"/usr/local/bin/${pkg}\"\n }\n\n if(Test-Path $dist){\n printTips $pkg exists`, skip\n continue;\n }\n\n if($_isWindows){\n curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist\n }else{\n sudo curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist\n sudo chmod +x $dist\n }\n\n}\n", "test": "cfssl version" }, "version": "1.6.1" diff --git a/windows/lnmp-windows-pm-repo/compose/lwpm.json b/windows/lnmp-windows-pm-repo/compose/lwpm.json index 496793e0b..7b04b9513 100644 --- a/windows/lnmp-windows-pm-repo/compose/lwpm.json +++ b/windows/lnmp-windows-pm-repo/compose/lwpm.json @@ -38,6 +38,6 @@ "version": "(docker compose version).split(' ')[3].trim('v')" }, "url": "https://github.com/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe})", - "url-mirror": "https://download.fgit.ml/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe})", + "url-mirror": "https://${env:GITHUB_MIRROR}/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe})", "version": "2.17.3" } diff --git a/windows/lnmp-windows-pm-repo/compose/lwpm.yaml b/windows/lnmp-windows-pm-repo/compose/lwpm.yaml index ec2806f8f..3fface5fa 100644 --- a/windows/lnmp-windows-pm-repo/compose/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/compose/lwpm.yaml @@ -2,7 +2,7 @@ name: compose version: 2.17.3 pre-version: 2.17.3 url: https://github.com/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe}) -url-mirror: https://download.fgit.ml/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe}) +url-mirror: https://${env:GITHUB_MIRROR}/docker/compose/releases/download/v${VERSION}/docker-compose-${env:lwpm_os}-${env:LWPM_UNAME_M}$(if($_IsWindows){echo .exe}) scripts: install: - _mkdir $HOME/.docker/cli-plugins/ diff --git a/windows/lnmp-windows-pm-repo/coredns/lwpm.json b/windows/lnmp-windows-pm-repo/coredns/lwpm.json index f7ae9bbaf..8aad5e900 100644 --- a/windows/lnmp-windows-pm-repo/coredns/lwpm.json +++ b/windows/lnmp-windows-pm-repo/coredns/lwpm.json @@ -8,7 +8,7 @@ "github": "coredns/coredns", "releases": "https://github.com/coredns/coredns/releases", "url": "https://github.com/coredns/coredns/releases/download/v${VERSION}/coredns_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.tgz", - "url-mirror": "https://download.fgit.ml/coredns/coredns/releases/download/v${VERSION}/coredns_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.tgz", + "url-mirror": "https://${env:GITHUB_MIRROR}/coredns/coredns/releases/download/v${VERSION}/coredns_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.tgz", "command": "coredns", "scripts": { "test": "printInfo $(coredns --version)[0] install success", diff --git a/windows/lnmp-windows-pm-repo/deno/lwpm.json b/windows/lnmp-windows-pm-repo/deno/lwpm.json index 122d1fa3c..857df4785 100644 --- a/windows/lnmp-windows-pm-repo/deno/lwpm.json +++ b/windows/lnmp-windows-pm-repo/deno/lwpm.json @@ -8,7 +8,7 @@ "github": "denoland/deno", "releases": "https://github.com/denoland/deno/releases", "url": "https://github.com/denoland/deno/releases/download/v${VERSION}/deno-x86_64-$(if($IsWindows){echo pc-windows-msvc}elseif($IsMacOS){echo apple-darwin}else{echo unknown-linux-gnu}).zip", - "url-mirror": "https://download.fgit.ml/denoland/deno/releases/download/v${VERSION}/deno-x86_64-$(if($IsWindows){echo pc-windows-msvc}elseif($IsMacOS){echo apple-darwin}else{echo unknown-linux-gnu}).zip", + "url-mirror": "https://${env:GITHUB_MIRROR}/denoland/deno/releases/download/v${VERSION}/deno-x86_64-$(if($IsWindows){echo pc-windows-msvc}elseif($IsMacOS){echo apple-darwin}else{echo unknown-linux-gnu}).zip", "command": "deno", "download-filename": "deno-${VERSION}-x86_64-pc-windows-msvc.zip", "scripts": { diff --git a/windows/lnmp-windows-pm-repo/dive/lwpm.json b/windows/lnmp-windows-pm-repo/dive/lwpm.json index 82d9f6d28..9b86fe9c7 100644 --- a/windows/lnmp-windows-pm-repo/dive/lwpm.json +++ b/windows/lnmp-windows-pm-repo/dive/lwpm.json @@ -8,7 +8,7 @@ "github": "wagoodman/dive", "releases": "https://github.com/wagoodman/dive/releases", "url": "https://github.com/wagoodman/dive/releases/download/v${VERSION}/dive_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", - "url-mirror": "https://download.fgit.ml/wagoodman/dive/releases/download/v${VERSION}/dive_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", + "url-mirror": "https://${env:GITHUB_MIRROR}/wagoodman/dive/releases/download/v${VERSION}/dive_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", "hash-url": { "sha256": "https://github.com/wagoodman/dive/releases/download/v${VERSION}/dive_${VERSION}_checksums.txt" }, diff --git a/windows/lnmp-windows-pm-repo/etcher/lwpm.json b/windows/lnmp-windows-pm-repo/etcher/lwpm.json index 14b44be8c..a1061a72b 100644 --- a/windows/lnmp-windows-pm-repo/etcher/lwpm.json +++ b/windows/lnmp-windows-pm-repo/etcher/lwpm.json @@ -6,7 +6,7 @@ "platform-reqs": "if($env:lwpm_os -eq 'linux'){echo $false}" }, "url": "https://github.com/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}})", - "url-mirror": "https://download.fgit.ml/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}})", + "url-mirror": "https://${env:GITHUB_MIRROR}/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}})", "version": "1.18.4", "github": "balena-io/etcher" } diff --git a/windows/lnmp-windows-pm-repo/etcher/lwpm.yaml b/windows/lnmp-windows-pm-repo/etcher/lwpm.yaml index 7825d961f..422599221 100644 --- a/windows/lnmp-windows-pm-repo/etcher/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/etcher/lwpm.yaml @@ -4,6 +4,6 @@ scripts: platform-reqs: if($env:lwpm_os -eq 'linux'){echo $false} install: Start-Process -FilePath $filename -wait url: https://github.com/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}}) -url-mirror: https://download.fgit.ml/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}}) +url-mirror: https://${env:GITHUB_MIRROR}/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}}) version: 1.18.4 github: balena-io/etcher diff --git a/windows/lnmp-windows-pm-repo/frp/lwpm.json b/windows/lnmp-windows-pm-repo/frp/lwpm.json index fcbbb3935..76d134f8f 100644 --- a/windows/lnmp-windows-pm-repo/frp/lwpm.json +++ b/windows/lnmp-windows-pm-repo/frp/lwpm.json @@ -8,7 +8,7 @@ "github": "fatedier/frp", "releases": "https://github.com/fatedier/frp/releases", "url": "https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", - "url-mirror": "https://download.fgit.ml/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", + "url-mirror": "https://${env:GITHUB_MIRROR}/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", "command": "frpc", "scripts": { "service": [ diff --git a/windows/lnmp-windows-pm-repo/gh/lwpm.json b/windows/lnmp-windows-pm-repo/gh/lwpm.json index 8d74c56bd..5ee549d0d 100644 --- a/windows/lnmp-windows-pm-repo/gh/lwpm.json +++ b/windows/lnmp-windows-pm-repo/gh/lwpm.json @@ -8,9 +8,9 @@ "github": "cli/cli", "releases": "https://github.com/cli/cli/releases", "url": "https://github.com/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", - "url-mirror": "https://download.fgit.ml/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", + "url-mirror": "https://${env:GITHUB_MIRROR}/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", "pre-url": "https://github.com/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", - "pre-url-mirror": "https://download.fgit.ml/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", + "pre-url-mirror": "https://${env:GITHUB_MIRROR}/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_$(if($IsMacOS){echo macos}else{echo ${env:lwpm_os}})_${env:lwpm_architecture}.$(if($IsWindows){echo 'zip'}else{echo 'tar.gz'})", "command": "gh", "scripts": { "preinstall": "", diff --git a/windows/lnmp-windows-pm-repo/jx/lwpm.json b/windows/lnmp-windows-pm-repo/jx/lwpm.json index 1cdf7bac6..a63bc197c 100644 --- a/windows/lnmp-windows-pm-repo/jx/lwpm.json +++ b/windows/lnmp-windows-pm-repo/jx/lwpm.json @@ -1,7 +1,7 @@ { "command": "jx", "url": "https://github.com/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip", - "url-mirror": "https://download.fgit.ml/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip", + "url-mirror": "https://${env:GITHUB_MIRROR}/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip", "github": "jenkins-x/jx", "version": "2.1.33", "description": "Jenkins X provides automated CI+CD for Kubernetes with Preview Environments on Pull Requests using Tekton, Knative, Prow, Skaffold and Helm", diff --git a/windows/lnmp-windows-pm-repo/jx/lwpm.yaml b/windows/lnmp-windows-pm-repo/jx/lwpm.yaml index dc9bba6e5..632151cd0 100644 --- a/windows/lnmp-windows-pm-repo/jx/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/jx/lwpm.yaml @@ -2,7 +2,7 @@ name: jx description: Jenkins X provides automated CI+CD for Kubernetes with Preview Environments on Pull Requests using Tekton, Knative, Prow, Skaffold and Helm version: 2.1.33 url: https://github.com/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip -url-mirror: https://download.fgit.ml/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip +url-mirror: https://${env:GITHUB_MIRROR}/jenkins-x/jx/releases/download/v${VERSION}/jx-${env:lwpm_os}-${env:lwpm_architecture}.zip github: jenkins-x/jx command: jx scripts: diff --git a/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.json index 2a86634db..c14d757d9 100644 --- a/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.json @@ -15,6 +15,6 @@ "platform-reqs": "if(!$IsLinux){echo $False}" }, "url": "https://github.com/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture}", - "url-mirror": "https://download.fgit.ml/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture}", + "url-mirror": "https://${env:GITHUB_MIRROR}/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture}", "version": "2.1.3" } diff --git a/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.yml index 808908b86..369154a1c 100644 --- a/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/conmon/lwpm.yml @@ -1,7 +1,7 @@ name: conmon version: 2.1.3 url: "https://github.com/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture}" -url-mirror: https://download.fgit.ml/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture} +url-mirror: https://${env:GITHUB_MIRROR}/containers/conmon/releases/download/v${VERSION}/conmon.${env:lwpm_architecture} scripts: dist: | _mkdir $env:LWPM_PKG_ROOT/dist diff --git a/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.json index 1fd310967..2575b0d17 100644 --- a/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.json @@ -23,6 +23,6 @@ "platform-reqs": "if($IsMacOs){echo $False}" }, "url": "https://github.com/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "url-mirror": "https://download.fgit.ml/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", + "url-mirror": "https://${env:GITHUB_MIRROR}/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", "version": "1.7.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.yml index dd2f316d4..7525a0cff 100644 --- a/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.yml @@ -2,7 +2,7 @@ name: containerd version: 1.7.0 pre-version: 1.7.0 url: "https://github.com/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" -url-mirror: https://download.fgit.ml/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz +url-mirror: https://${env:GITHUB_MIRROR}/containerd/containerd/releases/download/v${VERSION}/cri-containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz scripts: platform-reqs: if($IsMacOs){echo $False} dist: | diff --git a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json index 17af39600..92f928311 100644 --- a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json @@ -31,6 +31,6 @@ "version": "(crictl --version).split(' ')[2].trim('v')" }, "url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "url-mirror": "https://download.fgit.ml/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", + "url-mirror": "https://${env:GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", "version": "1.27.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml index 42fc89d13..b1f419016 100644 --- a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml @@ -1,7 +1,7 @@ name: crictl version: 1.27.0 url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" -url-mirror: https://download.fgit.ml/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz +url-mirror: https://${env:GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz command: crictl scripts: dist: | diff --git a/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.json index cd5143da0..b937b114e 100644 --- a/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.json @@ -13,7 +13,7 @@ "version": "istioctl version --remote=false -s" }, "url": "https://github.com/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip", - "url-mirror": "https://download.fgit.ml/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip", + "url-mirror": "https://${env:GITHUB_MIRROR}/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip", "version": "1.10.0", "pre-version": "1.10.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.yaml b/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.yaml index 9c7be74fd..38b6a13ff 100644 --- a/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/k8s/istioctl/lwpm.yaml @@ -1,6 +1,6 @@ name: istioctl url: https://github.com/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip -url-mirror: https://download.fgit.ml/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip +url-mirror: https://${env:GITHUB_MIRROR}/istio/istio/releases/download/${VERSION}/istioctl-${VERSION}-win.zip version: 1.10.0 pre-version: 1.10.0 scripts: diff --git a/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.json index a9e8bfb1f..f6c1a3e95 100644 --- a/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.json @@ -15,6 +15,6 @@ "platform-reqs": "if(!$IsLinux){echo $False}" }, "url": "https://github.com/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture}", - "url-mirror": "https://download.fgit.ml/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture}", + "url-mirror": "https://${env:GITHUB_MIRROR}/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture}", "version": "1.1.3" } diff --git a/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.yml index 03913a174..eb2066e1b 100644 --- a/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/runc/lwpm.yml @@ -1,7 +1,7 @@ name: runc version: 1.1.3 url: "https://github.com/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture}" -url-mirror: https://download.fgit.ml/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture} +url-mirror: https://${env:GITHUB_MIRROR}/opencontainers/runc/releases/download/v${VERSION}/runc.${env:lwpm_architecture} scripts: platform-reqs: if(!$IsLinux){echo $False} dist: | diff --git a/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.json index 4a7f6f471..c8f097b70 100644 --- a/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.json @@ -13,6 +13,6 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist\n\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/$filename\n" }, "url": "https://github.com/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz", - "url-mirror": "https://download.fgit.ml/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz", + "url-mirror": "https://${env:GITHUB_MIRROR}/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz", "version": "nightly" } diff --git a/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.yml index 265ff0ca9..6dfe4cc65 100644 --- a/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/runsc/lwpm.yml @@ -1,7 +1,7 @@ name: runsc version: nightly url: "https://github.com/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz" -url-mirror: https://download.fgit.ml/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz +url-mirror: https://${env:GITHUB_MIRROR}/docker-practice/gvisor-mirror/releases/download/nightly/runsc-linux-amd64.tar.gz scripts: platform-reqs: if(!$IsLinux){echo $False} dist: | diff --git a/windows/lnmp-windows-pm-repo/mariadb/lwpm.json b/windows/lnmp-windows-pm-repo/mariadb/lwpm.json index 75e52f537..a0caa85b4 100644 --- a/windows/lnmp-windows-pm-repo/mariadb/lwpm.json +++ b/windows/lnmp-windows-pm-repo/mariadb/lwpm.json @@ -9,19 +9,19 @@ "path": [ "C:\\mariadb\\bin" ], - "pre-version": "10.11.4", + "pre-version": "10.11.5", "scripts": { "install": "_cleanup mariadb\n_unzip $filename mariadb\n\n_mkdir C:\\mariadb\nCopy-item -r -force \"mariadb\\mariadb-${VERSION}-winx64\\*\" \"C:\\mariadb\\\"\n\n_cleanup mariadb\n", "platform-reqs": "if(!$IsWindows){echo $False}", - "postinstall": "if(!(Test-Path C:\\mariadb\\data)){\nmkdir C:\\mariadb\\data\n\nWrite-Host \"MariaDB is init ...\"\n\nC:\\mariadb\\bin\\mysql_install_db.exe --port 3307 -D -R -proot\n\n# 安装服务\n\n_sudo mariadbd --install mariadb\n\n# 禁止开机启动\n\n_sudo set-service mariadb -StartupType Manual\n}\n\nWrite-host \"\n\nPlease exec command start(or init) mariadb\n\n$ net start mariadb\n\n$ C:\\mariadb\\bin\\mariadb.exe -uroot -proot\n\"\n", + "postinstall": "if(!(Test-Path C:\\mariadb\\data)){\nWrite-Host \"MariaDB is init ...\"\n\nC:\\mariadb\\bin\\mariadb-install-db.exe --port 3307 -D -R -proot\n\n# 安装服务\n\n_sudo C:\\mariadb\\bin\\mariadbd --install mariadb\n\n# 禁止开机启动\n\n_sudo set-service mariadb -StartupType Manual\n}\n\nWrite-host \"\n\nPlease exec command start(or init) mariadb\n\n$ net start mariadb\n\n$ C:\\mariadb\\bin\\mariadb.exe -uroot -proot\n\"\n", "preinstall": [ "# https://docs.microsoft.com/zh-cn/cpp/windows/redistributing-visual-cpp-files?view=msvc-170#install-the-redistributable-packages\n# check vclib installed\nif(!(Test-Path 'HKLM:\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64')){\n PrintError 'Please install vclib first, exec $ lpm install vclib'\n\n exit 1\n}\n\nif((Get-ItemProperty 'HKLM:\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64').Installed -ne 1){\n PrintError 'Please install vclib first, exec $ lpm install vclib'\n\n exit 1\n}\n\nprintInfo 'vclib already installed, continue ...'\n" ], - "test": "printInfo mariadb (C:\\mariadb\\bin\\mysql --version).split(' ')[5].split('-')[0] install success", + "test": "printInfo mariadb (C:\\mariadb\\bin\\mariadb --version).split(' ')[5].split('-')[0] install success", "uninstall": "_sudo mariadbd --remove\n_cleanup C:\\mariadb\n", "version": "(mariadb --version).split(\" \")[3]" }, "url": "https://mirrors.aliyun.com/mariadb/mariadb-${VERSION}/winx64-packages/mariadb-${VERSION}-winx64.zip", "url-mirror": "https://mirrors4.tuna.tsinghua.edu.cn/mariadb/mariadb-${VERSION}/winx64-packages/mariadb-${VERSION}-winx64.zip", - "version": "10.11.4" + "version": "10.11.5" } diff --git a/windows/lnmp-windows-pm-repo/mariadb/lwpm.yaml b/windows/lnmp-windows-pm-repo/mariadb/lwpm.yaml index 39fdf49ca..4cd81ac5f 100644 --- a/windows/lnmp-windows-pm-repo/mariadb/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/mariadb/lwpm.yaml @@ -1,7 +1,7 @@ name: mariadb description: 'MariaDB server is a community developed fork of MySQL server. ' -version: "10.11.4" -pre-version: "10.11.4" +version: "10.11.5" +pre-version: "10.11.5" homepage: "https://mariadb.org/" bug: "" github: "MariaDB/server" @@ -11,15 +11,13 @@ download-filename: mariadb-${VERSION}-winx64.zip scripts: postinstall: | if(!(Test-Path C:\mariadb\data)){ - mkdir C:\mariadb\data - Write-Host "MariaDB is init ..." - C:\mariadb\bin\mysql_install_db.exe --port 3307 -D -R -proot + C:\mariadb\bin\mariadb-install-db.exe --port 3307 -D -R -proot # 安装服务 - _sudo mariadbd --install mariadb + _sudo C:\mariadb\bin\mariadbd --install mariadb # 禁止开机启动 @@ -42,7 +40,7 @@ scripts: Copy-item -r -force "mariadb\mariadb-${VERSION}-winx64\*" "C:\mariadb\" _cleanup mariadb - test: printInfo mariadb (C:\mariadb\bin\mysql --version).split(' ')[5].split('-')[0] install success + test: printInfo mariadb (C:\mariadb\bin\mariadb --version).split(' ')[5].split('-')[0] install success uninstall: | _sudo mariadbd --remove _cleanup C:\mariadb diff --git a/windows/lnmp-windows-pm-repo/node/lwpm.json b/windows/lnmp-windows-pm-repo/node/lwpm.json index 45fe898c3..9de324d88 100644 --- a/windows/lnmp-windows-pm-repo/node/lwpm.json +++ b/windows/lnmp-windows-pm-repo/node/lwpm.json @@ -1,8 +1,8 @@ { "name": "node", "description": "Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine", - "version": "16.15.0", - "pre-version": "18.2.0", + "version": "18.17.1", + "pre-version": "20.5.1", "homepage": "https://nodejs.org/en/", "bug": "https://github.com/nodejs/node/issues", "github": "nodejs/node", diff --git a/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.json b/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.json index b9bb6173c..9ef02feb8 100644 --- a/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.json @@ -35,6 +35,6 @@ "version": "" }, "url": "https://github.com/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe", - "url-mirror": "https://download.fgit.ml/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe", + "url-mirror": "https://${env:GITHUB_MIRROR}/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe", "version": "1.1.23" } diff --git a/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.yaml index f744642ba..3a1cec426 100644 --- a/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-cgi-spawner/lwpm.yaml @@ -7,7 +7,7 @@ bug: "" github: deemru/php-cgi-spawner releases: "" url: "https://github.com/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe" -url-mirror: "https://download.fgit.ml/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe" +url-mirror: "https://${env:GITHUB_MIRROR}/deemru/php-cgi-spawner/releases/download/${VERSION}/php-cgi-spawner.exe" pre-url: "" pre-url-mirror: "" command: "" diff --git a/windows/lnmp-windows-pm-repo/php-cs-fixer/lwpm.json b/windows/lnmp-windows-pm-repo/php-cs-fixer/lwpm.json index 58d9b4872..0b452e6a6 100644 --- a/windows/lnmp-windows-pm-repo/php-cs-fixer/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-cs-fixer/lwpm.json @@ -8,7 +8,7 @@ "github": "FriendsOfPHP/PHP-CS-Fixer", "releases": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${VERSION}/php-cs-fixer.phar", - "url-mirror": "https://download.fgit.ml/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${VERSION}/php-cs-fixer.phar", + "url-mirror": "https://${env:GITHUB_MIRROR}/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${VERSION}/php-cs-fixer.phar", "command": "php-cs-fixer", "download-filename": "php-cs-fixer-${VERSION}.phar", "scripts": { diff --git a/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.json b/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.json index 16c9a8646..3cf8b643b 100644 --- a/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.json @@ -14,7 +14,7 @@ "releases": "", "scripts": { "install": [ - "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fgit.ml'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT} --php ${env:PHP_BIN}\n" + "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='${env:GITHUB_MIRROR}'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT} --php ${env:PHP_BIN}\n" ], "postinstall": "", "posttest": "", diff --git a/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.yaml index d63377bf7..19473d763 100644 --- a/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-igbinary/lwpm.yaml @@ -34,7 +34,7 @@ scripts: } $GITHUB_DOWNLOAD_URL='github.com' - $GITHUB_DOWNLOAD_URL='download.fgit.ml' + $GITHUB_DOWNLOAD_URL='${env:GITHUB_MIRROR}' $PHP_EXT=${lwpm}.name.replace('php-','') if (Test-Path $HOME/github/pickle/bin/pickle){ diff --git a/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.json b/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.json index 5973eb174..349da1404 100644 --- a/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.json @@ -14,7 +14,7 @@ "releases": "", "scripts": { "install": [ - "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fgit.ml'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT}@${VERSION} --php ${env:PHP_BIN}\n" + "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='${env:GITHUB_MIRROR}'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT}@${VERSION} --php ${env:PHP_BIN}\n" ], "postinstall": "", "posttest": "", diff --git a/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.yaml index 5efd2df5e..466fbff18 100644 --- a/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-mongodb/lwpm.yaml @@ -34,7 +34,7 @@ scripts: } $GITHUB_DOWNLOAD_URL='github.com' - $GITHUB_DOWNLOAD_URL='download.fgit.ml' + $GITHUB_DOWNLOAD_URL='${env:GITHUB_MIRROR}' $PHP_EXT=${lwpm}.name.replace('php-','') if (Test-Path $HOME/github/pickle/bin/pickle){ diff --git a/windows/lnmp-windows-pm-repo/php-redis/lwpm.json b/windows/lnmp-windows-pm-repo/php-redis/lwpm.json index ee7f0ae56..812fc9bd8 100644 --- a/windows/lnmp-windows-pm-repo/php-redis/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-redis/lwpm.json @@ -14,7 +14,7 @@ "releases": "", "scripts": { "install": [ - "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fgit.ml'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT} --php ${env:PHP_BIN}\n" + "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='${env:GITHUB_MIRROR}'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT} --php ${env:PHP_BIN}\n" ], "postinstall": "", "posttest": "", diff --git a/windows/lnmp-windows-pm-repo/php-redis/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-redis/lwpm.yaml index 41e9332ea..12e47eb4e 100644 --- a/windows/lnmp-windows-pm-repo/php-redis/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-redis/lwpm.yaml @@ -34,7 +34,7 @@ scripts: } $GITHUB_DOWNLOAD_URL='github.com' - $GITHUB_DOWNLOAD_URL='download.fgit.ml' + $GITHUB_DOWNLOAD_URL='${env:GITHUB_MIRROR}' $PHP_EXT=${lwpm}.name.replace('php-','') if (Test-Path $HOME/github/pickle/bin/pickle){ diff --git a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json index 131b0a433..d32afda63 100644 --- a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json @@ -14,7 +14,7 @@ "releases": "", "scripts": { "install": [ - "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='download.fgit.ml'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT}@${VERSION} --php ${env:PHP_BIN}\n" + "$PHP_PREFIX='C:/php'\n\nif($isPre -eq 1){\n $PHP_PREFIX=\"${PHP_PREFIX}-pre\"\n}\n\n$env:PHP_BIN=\"${PHP_PREFIX}/php.exe\"\n\nif (!(Test-Path \"$env:PHP_BIN\")){\n printError \"can't fount php.exe on [$PHP_PREFIX]\"\n\n exit 1\n}\n\n$GITHUB_DOWNLOAD_URL='github.com'\n$GITHUB_DOWNLOAD_URL='${env:GITHUB_MIRROR}'\n$PHP_EXT=${lwpm}.name.replace('php-','')\n\nif (Test-Path $HOME/github/pickle/bin/pickle){\n $PICKLE_PATH=\"$HOME/github/pickle/bin/pickle\"\n}else{\n if(!(Test-Path C:\\bin\\pickle)){\n printInfo \"pickle not install, installing...\"\n _downloader `\n https://${GITHUB_DOWNLOAD_URL}/khs1994-php/pickle/releases/download/nightly/pickle-debug.phar `\n pickle `\n pickle\n\n copy-item -r -force pickle C:\\bin\n }\n\n $PICKLE_PATH='C:\\bin\\pickle'\n}\n\nprintInfo \"use $PICKLE_PATH\"\n\n& ${env:PHP_BIN} $PICKLE_PATH install ${PHP_EXT}@${VERSION} --php ${env:PHP_BIN}\n" ], "postinstall": "", "posttest": "", diff --git a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml index 7bcbf4b6e..486f54a97 100644 --- a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml @@ -34,7 +34,7 @@ scripts: } $GITHUB_DOWNLOAD_URL='github.com' - $GITHUB_DOWNLOAD_URL='download.fgit.ml' + $GITHUB_DOWNLOAD_URL='${env:GITHUB_MIRROR}' $PHP_EXT=${lwpm}.name.replace('php-','') if (Test-Path $HOME/github/pickle/bin/pickle){ diff --git a/windows/lnmp-windows-pm-repo/pwsh/lwpm.json b/windows/lnmp-windows-pm-repo/pwsh/lwpm.json index 09d70ae8b..541feab83 100644 --- a/windows/lnmp-windows-pm-repo/pwsh/lwpm.json +++ b/windows/lnmp-windows-pm-repo/pwsh/lwpm.json @@ -8,7 +8,7 @@ "github": "PowerShell/PowerShell", "releases": "https://github.com/PowerShell/PowerShell/releases", "url": "https://github.com/PowerShell/PowerShell/releases/download/v${VERSION}/PowerShell-${VERSION}-$(if($IsWindows){echo win}else{echo osx})-x64.$(if($IsWindows){echo msi}else{echo pkg})", - "url-mirror": "https://download.fgit.ml/PowerShell/PowerShell/releases/download/v${VERSION}/PowerShell-${VERSION}-$(if($IsWindows){echo win}else{echo osx})-x64.$(if($IsWindows){echo msi}else{echo pkg})", + "url-mirror": "https://${env:GITHUB_MIRROR}/PowerShell/PowerShell/releases/download/v${VERSION}/PowerShell-${VERSION}-$(if($IsWindows){echo win}else{echo osx})-x64.$(if($IsWindows){echo msi}else{echo pkg})", "command": "pwsh", "scripts": { "platform-reqs": [ diff --git a/windows/lnmp-windows-pm-repo/s6/lwpm.json b/windows/lnmp-windows-pm-repo/s6/lwpm.json index 4fe39c1f2..684d5c550 100644 --- a/windows/lnmp-windows-pm-repo/s6/lwpm.json +++ b/windows/lnmp-windows-pm-repo/s6/lwpm.json @@ -11,6 +11,6 @@ "platform-reqs": "if(!$_IsLinux){echo $false}" }, "url": "https://github.com/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz", - "url-mirror": "https://download.fgit.ml/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz", + "url-mirror": "https://${env:GITHUB_MIRROR}/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz", "version": "3.1.4.2" } diff --git a/windows/lnmp-windows-pm-repo/s6/lwpm.yaml b/windows/lnmp-windows-pm-repo/s6/lwpm.yaml index 0bea69b2f..fea1225a9 100644 --- a/windows/lnmp-windows-pm-repo/s6/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/s6/lwpm.yaml @@ -1,7 +1,7 @@ name: s6 version: 3.1.4.2 url: https://github.com/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz -url-mirror: https://download.fgit.ml/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz +url-mirror: https://${env:GITHUB_MIRROR}/just-containers/s6-overlay/releases/download/v${VERSION}/s6-overlay-x86_64.tar.xz scripts: platform-reqs: if(!$_IsLinux){echo $false} install: |- diff --git a/windows/lnmp-windows-pm-repo/vclib/lwpm.json b/windows/lnmp-windows-pm-repo/vclib/lwpm.json index f19a22453..6a94bc368 100644 --- a/windows/lnmp-windows-pm-repo/vclib/lwpm.json +++ b/windows/lnmp-windows-pm-repo/vclib/lwpm.json @@ -1,13 +1,13 @@ { "name": "vclib", "description": "Microsoft Visual C++ 2015-2022 Redistributable (x64)", - "version": "14.32.31332.00", - "pre-version": "14.32.31332.00", + "version": "14.x", + "pre-version": "14.x", "homepage": "https://docs.microsoft.com/zh-cn/cpp/windows/latest-supported-vc-redist", "bug": "", "github": "", "releases": "https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/VC%2B%2B2015-2022Redist-x64", - "url": "https://aka.ms/vs/${VERSION}/release/vc_redist.x64.exe", + "url": "https://aka.ms/vs/17/release/vc_redist.x64.exe", "scripts": { "platform-reqs": "if(!$IsWindows){echo $False}", "install": [ diff --git a/windows/lnmp-windows-pm-repo/vim/lwpm.json b/windows/lnmp-windows-pm-repo/vim/lwpm.json index cd3f3d094..9ffa491d4 100644 --- a/windows/lnmp-windows-pm-repo/vim/lwpm.json +++ b/windows/lnmp-windows-pm-repo/vim/lwpm.json @@ -8,7 +8,7 @@ "github": "vim/vim-win32-installer", "releases": "https://github.com/vim/vim-win32-installer/releases", "url": "https://github.com/vim/vim-win32-installer/releases/download/v${VERSION}/gvim_${VERSION}_x86.exe", - "url-mirror": "https://download.fgit.ml/vim/vim-win32-installer/releases/download/v${VERSION}/gvim_${VERSION}_x86.exe", + "url-mirror": "https://${env:GITHUB_MIRROR}/vim/vim-win32-installer/releases/download/v${VERSION}/gvim_${VERSION}_x86.exe", "command": "vim", "scripts": { "platform-reqs": [ diff --git a/windows/lnmp-windows-pm-repo/zeal/lwpm.json b/windows/lnmp-windows-pm-repo/zeal/lwpm.json index c3a081b02..48b32dd0f 100644 --- a/windows/lnmp-windows-pm-repo/zeal/lwpm.json +++ b/windows/lnmp-windows-pm-repo/zeal/lwpm.json @@ -8,7 +8,7 @@ "github": "zealdocs/zeal", "releases": "https://github.com/zealdocs/zeal/releases", "url": "https://github.com/zealdocs/zeal/releases/download/v${VERSION}/zeal-${VERSION}-windows-x64.msi", - "url-mirror": "https://download.fgit.ml/zealdocs/zeal/releases/download/v${VERSION}/zeal-${VERSION}-windows-x64.msi", + "url-mirror": "https://${env:GITHUB_MIRROR}/zealdocs/zeal/releases/download/v${VERSION}/zeal-${VERSION}-windows-x64.msi", "command": "${env:ProgramFiles}\\Zeal\\zeal.exe", "scripts": { "install": "Start-Process -FilePath 'C:\\windows\\system32\\msiexec.exe' -ArgumentList \"/i $filename /passive\" -Wait", diff --git a/windows/lnmp-windows-pm-repo/zstd/lwpm.json b/windows/lnmp-windows-pm-repo/zstd/lwpm.json index cca578d72..2b58c2f5f 100644 --- a/windows/lnmp-windows-pm-repo/zstd/lwpm.json +++ b/windows/lnmp-windows-pm-repo/zstd/lwpm.json @@ -8,7 +8,7 @@ "github": "facebook/zstd", "releases": "", "url": "https://github.com/facebook/zstd/releases/download/v${VERSION}/zstd-v${VERSION}-win64.zip", - "url-mirror": "https://download.fgit.ml/facebook/zstd/releases/download/v${VERSION}/zstd-v${VERSION}-win64.zip", + "url-mirror": "https://${env:GITHUB_MIRROR}/facebook/zstd/releases/download/v${VERSION}/zstd-v${VERSION}-win64.zip", "pre-url": "", "pre-url-mirror": "", "command": "zstd", diff --git a/windows/lnmp-windows-pm.ps1 b/windows/lnmp-windows-pm.ps1 index 409ae811f..d331d11d5 100755 --- a/windows/lnmp-windows-pm.ps1 +++ b/windows/lnmp-windows-pm.ps1 @@ -82,6 +82,8 @@ Import-Module $PSScriptRoot/sdk/dockerhub/utils/Get-SHA.psm1 [environment]::SetEnvironmentvariable("DOCKER_BUILDKIT", "1", "User") [environment]::SetEnvironmentvariable("APP_ENV", "$APP_ENV", "User") +$env:GITHUB_MIRROR='download.fgit.ml' + if (!$Env:PSModulePathSystem) { $Env:PSModulePathSystem = $Env:PSModulePath } diff --git a/wsl/lnmp-wsl-install b/wsl/lnmp-wsl-install index c3328e351..78ec918cc 100755 --- a/wsl/lnmp-wsl-install +++ b/wsl/lnmp-wsl-install @@ -59,7 +59,7 @@ GO_PREFIX=/usr/local GO_VERSION=1.20.1 -NODE_VERSION=18.2.0 +NODE_VERSION=20.5.1 NODE_PREFIX=/usr/local diff --git a/wsl2/bin/kernel.ps1 b/wsl2/bin/kernel.ps1 index b59d413a1..6fe5aed83 100644 --- a/wsl2/bin/kernel.ps1 +++ b/wsl2/bin/kernel.ps1 @@ -58,9 +58,9 @@ Function _downloader($name, $url) { $GITHUB_RELEASE = "github.com" -if ($env:LNMP_CN_ENV -ne "false") { - $GITHUB_RELEASE = "download.fgit.ml" -} +# if ($env:LNMP_CN_ENV -ne "false") { +# $GITHUB_RELEASE = "download.fgit.ml" +# } _downloader "kernel-${kernelversion}-microsoft-standard-WSL2.img" "https://${GITHUB_RELEASE}/khs1994/WSL2-Linux-Kernel/releases/download/${kernelversion}-microsoft-standard-WSL2/kernel-${kernelversion}-microsoft-standard-WSL2.img" _downloader $deb "https://${GITHUB_RELEASE}/khs1994/WSL2-Linux-Kernel/releases/download/${kernelversion}-microsoft-standard-WSL2/$deb" diff --git a/wsl2/kernel.next.version b/wsl2/kernel.next.version index 04cb4cc12..fdda0aa2b 100644 --- a/wsl2/kernel.next.version +++ b/wsl2/kernel.next.version @@ -1 +1 @@ -6.1.21.1 +6.1.21.2 diff --git a/wsl2/kernel.version b/wsl2/kernel.version index 4f4e82691..04ef98192 100644 --- a/wsl2/kernel.version +++ b/wsl2/kernel.version @@ -1 +1 @@ -5.15.79.1 +5.15.123.1 From 3d66b0ffdceb020880b61c66974fea68c8d13a2b Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Fri, 10 Nov 2023 17:31:01 +0800 Subject: [PATCH 24/42] Update lwpm pkg Signed-off-by: Kang Huaishuai --- windows/lnmp-windows-pm-repo/adb/lwpm.json | 12 +++++++----- windows/lnmp-windows-pm-repo/cfssl/lwpm.json | 4 ++-- windows/lnmp-windows-pm-repo/cfssl/lwpm.yaml | 7 ++++--- windows/lnmp-windows-pm-repo/deno/lwpm.json | 4 ++-- windows/lnmp-windows-pm-repo/python/lwpm.json | 8 ++++---- windows/lnmp-windows-pm-repo/python/lwpm.yaml | 8 ++++---- windows/lnmp-windows-pm-repo/wechat/lwpm.json | 2 +- .../wechatDevtool/lwpm.json | 2 +- windows/lnmp-windows-pm.ps1 | 19 +++++++++++++++++++ 9 files changed, 44 insertions(+), 22 deletions(-) diff --git a/windows/lnmp-windows-pm-repo/adb/lwpm.json b/windows/lnmp-windows-pm-repo/adb/lwpm.json index e6f228639..37ac8a40e 100644 --- a/windows/lnmp-windows-pm-repo/adb/lwpm.json +++ b/windows/lnmp-windows-pm-repo/adb/lwpm.json @@ -7,8 +7,8 @@ "bug": "", "github": "", "releases": "https://developer.android.google.cn/studio/releases/platform-tools", - "url": "https://dl.google.com/android/repository/platform-tools-latest-${env:LWPM_OS}.zip", - "url-mirror": "https://dl.google.com/android/repository/platform-tools_r${VERSION}-windows.zip", + "url": "https://dl.google.com/android/repository/platform-tools-latest-${env:lwpm_os}.zip", + "url-mirror": "https://dl.google.com/android/repository/platform-tools_r${VERSION}-${env:lwpm_os}.zip", "pre-url": "", "pre-url-mirror": "", "command": "adb", @@ -16,17 +16,19 @@ "winget-pkgs": "https://hub.nuaa.cf/microsoft/winget-pkgs/tree/master/manifests/g/Google/PlatformTools", "scripts": { "preinstall": [ - "# _cleanup \"$unzipDesc\"" + "_cleanup \"$unzipDesc\"" ], "install": [ "if($IsWindows){_unzip $filename $env:ProgramData}", - "if(!$IsWindows){_unzip $filename /usr/local/platform-tools}" + "if(!$IsWindows){_unzip $filename $unzipDesc ; sudo cp -r $unzipDesc/platform-tools /usr/local/}", + "if(!$IsWindows){sudo ln -s /usr/local/platform-tools/adb /usr/local/bin/adb}" ], "postinstall": "", "preuninstall": "", "uninstall": [ "if($IsWindows){_cleanup $env:ProgramData\\platform-tools}", - "if(!$IsWindows){_cleanup /usr/local/platform-tools}" + "if(!$IsWindows){sudo rm -rf /usr/local/platform-tools}", + "if(!$IsWindows){sudo rm -rf /usr/local/bin/adb}" ], "postuninstall": "", "pruneuninstall": "", diff --git a/windows/lnmp-windows-pm-repo/cfssl/lwpm.json b/windows/lnmp-windows-pm-repo/cfssl/lwpm.json index a5f2a7c81..ffcb6b758 100644 --- a/windows/lnmp-windows-pm-repo/cfssl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/cfssl/lwpm.json @@ -6,8 +6,8 @@ ], "releases": "https://github.com/cloudflare/cfssl/releases", "scripts": { - "install": "$url = \"https://${env:GITHUB_MIRROR}/cloudflare/cfssl/releases/download/v${VERSION}\"\n$pkgs='cfssl','cfssl-bundle','cfssl-certinfo','cfssl-newkey','cfssl-scan','cfssljson','mkbundle','multirootca'\nforeach($pkg in $pkgs){\n printInfo Downloading $pkg ...\n\n if($_isWindows){\n $dist=\"C:\\bin\\${pkg}.exe\"\n }else{\n $dist=\"/usr/local/bin/${pkg}\"\n }\n\n if(Test-Path $dist){\n printTips $pkg exists`, skip\n continue;\n }\n\n if($_isWindows){\n curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist\n }else{\n sudo curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist\n sudo chmod +x $dist\n }\n\n}\n", + "install": "$url = \"https://github.com/cloudflare/cfssl/releases/download/v${VERSION}\"\n$pkgs='cfssl','cfssl-bundle','cfssl-certinfo','cfssl-newkey','cfssl-scan','cfssljson','mkbundle','multirootca'\nforeach($pkg in $pkgs){\n printInfo Downloading $pkg ...\n\n if($_isWindows){\n $dist=\"C:\\bin\\${pkg}.exe\"\n }else{\n $dist=\"/usr/local/bin/${pkg}\"\n }\n\n if(Test-Path $dist){\n printTips $pkg exists`, skip\n continue;\n }\n\n if($_isWindows){\n curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}$(if($_isWindows){echo .exe}) -o $dist\n }else{\n printInfo \"Download from $url/${pkg}_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}$(if($_isWindows){echo .exe})\"\n sudo curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}$(if($_isWindows){echo .exe}) -o $dist\n sudo chmod +x $dist\n }\n\n}\n", "test": "cfssl version" }, - "version": "1.6.1" + "version": "1.6.4" } diff --git a/windows/lnmp-windows-pm-repo/cfssl/lwpm.yaml b/windows/lnmp-windows-pm-repo/cfssl/lwpm.yaml index 3ba71e8fb..6ac438105 100644 --- a/windows/lnmp-windows-pm-repo/cfssl/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/cfssl/lwpm.yaml @@ -1,5 +1,5 @@ name: cfssl -version: 1.6.1 +version: 1.6.4 github: cloudflare/cfssl releases: https://github.com/cloudflare/cfssl/releases scripts: @@ -21,9 +21,10 @@ scripts: } if($_isWindows){ - curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist + curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}$(if($_isWindows){echo .exe}) -o $dist }else{ - sudo curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_amd64$(if($_isWindows){echo .exe}) -o $dist + printInfo "Download from $url/${pkg}_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}$(if($_isWindows){echo .exe})" + sudo curl -fsSL $url/${pkg}_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}$(if($_isWindows){echo .exe}) -o $dist sudo chmod +x $dist } diff --git a/windows/lnmp-windows-pm-repo/deno/lwpm.json b/windows/lnmp-windows-pm-repo/deno/lwpm.json index 857df4785..a53f0573d 100644 --- a/windows/lnmp-windows-pm-repo/deno/lwpm.json +++ b/windows/lnmp-windows-pm-repo/deno/lwpm.json @@ -1,8 +1,8 @@ { "name": "deno", "description": "A secure runtime for JavaScript and TypeScript built with V8, Rust, and Tokio", - "version": "1.31.1", - "pre-version": "1.31.1", + "version": "1.38.0", + "pre-version": "1.38.0", "homepage": "https://deno.land/", "bug": "https://github.com/denoland/deno/issues", "github": "denoland/deno", diff --git a/windows/lnmp-windows-pm-repo/python/lwpm.json b/windows/lnmp-windows-pm-repo/python/lwpm.json index dd05aaad3..d69d83166 100644 --- a/windows/lnmp-windows-pm-repo/python/lwpm.json +++ b/windows/lnmp-windows-pm-repo/python/lwpm.json @@ -9,8 +9,8 @@ "${env:ProgramData}\\Python", "${env:ProgramData}\\Python\\Scripts" ], - "pre-url": "https://www.python.org/ftp/python/${VERSION}/python-${VERSION}-amd64.exe", - "pre-url-mirror": "https://repo.huaweicloud.com/python/${VERSION}/python-${VERSION}-amd64.exe", + "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", "releases": "https://www.python.org/downloads/", "scripts": { @@ -21,7 +21,7 @@ "test": "python --version", "version": "($(python --version) -split \" \")[1]" }, - "url": "https://www.python.org/ftp/python/${VERSION}/python-${VERSION}-amd64.exe", - "url-mirror": "https://repo.huaweicloud.com/python/${VERSION}/python-${VERSION}-amd64.exe", + "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" } diff --git a/windows/lnmp-windows-pm-repo/python/lwpm.yaml b/windows/lnmp-windows-pm-repo/python/lwpm.yaml index 958d97261..84fe27703 100644 --- a/windows/lnmp-windows-pm-repo/python/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/python/lwpm.yaml @@ -6,10 +6,10 @@ homepage: "https://www.python.org/" bug: "" github: "python/cpython" releases: "https://www.python.org/downloads/" -url: "https://www.python.org/ftp/python/${VERSION}/python-${VERSION}-amd64.exe" -url-mirror: "https://repo.huaweicloud.com/python/${VERSION}/python-${VERSION}-amd64.exe" -pre-url: "https://www.python.org/ftp/python/${VERSION}/python-${VERSION}-amd64.exe" -pre-url-mirror: "https://repo.huaweicloud.com/python/${VERSION}/python-${VERSION}-amd64.exe" +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" +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" path: - ${env:ProgramData}\Python - ${env:ProgramData}\Python\Scripts diff --git a/windows/lnmp-windows-pm-repo/wechat/lwpm.json b/windows/lnmp-windows-pm-repo/wechat/lwpm.json index d4c9e6211..13d9c0ef5 100644 --- a/windows/lnmp-windows-pm-repo/wechat/lwpm.json +++ b/windows/lnmp-windows-pm-repo/wechat/lwpm.json @@ -16,6 +16,6 @@ "install": "Start-Process -FilePath $filename -wait", "uninstall": "& ${env:ProgramFiles(x86)}\\Tencent\\WeChat\\Uninstall.exe", "version": "echo ${VERSION}", - "test": "& get-command ${env:ProgramFiles(x86)}\\Tencent\\WeChat\\WeChat.exe" + "test": "if($IsWindows){& get-command ${env:ProgramFiles(x86)}\\Tencent\\WeChat\\WeChat.exe}" } } diff --git a/windows/lnmp-windows-pm-repo/wechatDevtool/lwpm.json b/windows/lnmp-windows-pm-repo/wechatDevtool/lwpm.json index 0193b42c7..717241a6c 100644 --- a/windows/lnmp-windows-pm-repo/wechatDevtool/lwpm.json +++ b/windows/lnmp-windows-pm-repo/wechatDevtool/lwpm.json @@ -5,7 +5,7 @@ "pre-version": "1.06.2305042", "homepage": "https://developers.weixin.qq.com/miniprogram/dev/devtools/devtools.html", "bug": "https://developers.weixin.qq.com/community/develop/question", - "github": "https://github.com/wechat-miniprogram", + "github": "wechat-miniprogram", "releases": "https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html", "url": "https://dldir1.qq.com/WechatWebDev/nightly/p-3bd19c2db3a642a0b39af853efaf67f8/0.54.1/wechat_devtools_${VERSION}$(if($IsWindows){echo _win32_x64.exe}else{if(${env:lwpm_architecture} -eq 'amd64'){echo _darwin_x64.dmg}else{echo _darwin_arm64.dmg}})", "command": "'C:\\Program Files (x86)\\Tencent\\微信web开发者工具\\cli.bat'", diff --git a/windows/lnmp-windows-pm.ps1 b/windows/lnmp-windows-pm.ps1 index d331d11d5..b110e34ad 100755 --- a/windows/lnmp-windows-pm.ps1 +++ b/windows/lnmp-windows-pm.ps1 @@ -27,6 +27,7 @@ list List available softs outdated Shows a list of installed packages that have updates available info Shows information about packages homepage Opens the package's repository URL or homepage in your browser +github Opens the package's repository URL in your browser bug Opens the package's bug report page in your browser releases Opens the package's releases page in your browser help Print help info @@ -644,8 +645,17 @@ function __homepage($soft) { $lwpm = manifest $soft if ($lwpm.homepage) { start-process $lwpm.homepage + + return + } + + if ($lwpm.github) { + start-process "https://github.com/$($lwpm.github)" } +} +function __github($soft) { + $lwpm = manifest $soft if ($lwpm.github) { start-process "https://github.com/$($lwpm.github)" } @@ -1061,6 +1071,15 @@ if ($args[0] -eq 'homepage') { _exit } +if ($args[0] -eq 'github') { + if ($args[1].length -eq 0) { + "Please input soft name" + _exit + } + __github $args[1] + _exit +} + if ($args[0] -eq 'bug') { if ($args[1].length -eq 0) { "Please input soft name" From 074da346923d8111681eedc604b9223659f938c3 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Fri, 10 Nov 2023 17:32:05 +0800 Subject: [PATCH 25/42] update nginx config Signed-off-by: Kang Huaishuai --- config/nginx/demo-satis.conf | 2 +- config/nginx/demo-ssl.config | 2 +- config/nginx/demo-www.conf | 4 ++-- .../nginx/demo.config/docker-registry.config | 2 +- config/nginx/demo.config/docker.mirror.config | 4 ++-- config/nginx/demo.config/fzjh.config | 2 +- config/nginx/demo.config/gitlab.config | 2 +- config/nginx/demo.config/gogs.config | 2 +- config/nginx/demo.config/http3.config | 2 +- config/nginx/demo.config/laravel.config | 2 +- config/nginx/demo.config/minio.config | 2 +- config/nginx/demo.config/ppm.config | 2 +- dockerfile/nginx/conf.d/http3-quic.conf | 2 +- docs/nginx/https.md | 2 +- drone/config/nginx/demo-drone.config | 2 +- .../configMap/nginx-conf-d/t.khs1994.com.conf | 6 +++--- .../conf.d/t.khs1994.com.development.conf | 6 +++--- .../conf.d/t.khs1994.com.production.conf | 6 +++--- lnmp-docker | 20 +++++++++++++++++-- lrew/laravel/config/laravel.conf | 2 +- lrew/pcit/conf/pcit.config | 2 +- lrew/pcit/conf/pcit.fpm.config | 2 +- lrew/pcit/conf/pcit.proxy.frontend.config | 2 +- windows/config/nginx/www.conf | 2 +- windows/config/nginx/www.container.config | 2 +- wsl/nginx/demo-ssl.config | 2 +- 26 files changed, 51 insertions(+), 35 deletions(-) diff --git a/config/nginx/demo-satis.conf b/config/nginx/demo-satis.conf index 309fac07f..dbabd7a02 100644 --- a/config/nginx/demo-satis.conf +++ b/config/nginx/demo-satis.conf @@ -1,6 +1,6 @@ server { server_name packagist.t.khs1994.com; - listen 443 http2; + listen 443 ssl; root /app/satis/output; include conf.d/demo-include-ssl.config; diff --git a/config/nginx/demo-ssl.config b/config/nginx/demo-ssl.config index 5d9a8eaa9..40235a138 100644 --- a/config/nginx/demo-ssl.config +++ b/config/nginx/demo-ssl.config @@ -10,7 +10,7 @@ server { } server{ - listen 443 ssl http2; + listen 443 ssl; server_name www.t.khs1994.com; index index.html index.htm index.php; diff --git a/config/nginx/demo-www.conf b/config/nginx/demo-www.conf index 27bae36ee..3bce308bc 100644 --- a/config/nginx/demo-www.conf +++ b/config/nginx/demo-www.conf @@ -8,7 +8,7 @@ server { } server{ - listen 443 ssl http2; + listen 443 ssl; server_name www.t.khs1994.com t.khs1994.com; root /app/demo/public; index index.html index.htm index.php; @@ -33,7 +33,7 @@ server { # server { - listen 443 ssl http2; + listen 443 ssl; server_name laravel.t.khs1994.com; root /app/laravel/public; index index.html index.htm index.php; diff --git a/config/nginx/demo.config/docker-registry.config b/config/nginx/demo.config/docker-registry.config index 044e1b0ed..3554ffc8b 100644 --- a/config/nginx/demo.config/docker-registry.config +++ b/config/nginx/demo.config/docker-registry.config @@ -13,7 +13,7 @@ map $upstream_http_docker_distribution_api_version $docker_distribution_api_vers } server { - listen 443 ssl http2; + listen 443 ssl; # fix me server_name REGISTRY_DOMAIN; diff --git a/config/nginx/demo.config/docker.mirror.config b/config/nginx/demo.config/docker.mirror.config index b4712c40e..5aa7b8dda 100644 --- a/config/nginx/demo.config/docker.mirror.config +++ b/config/nginx/demo.config/docker.mirror.config @@ -1,5 +1,5 @@ server { - listen 443 ssl http2; + listen 443 ssl; server_name mirror.t.khs1994.com; include conf.d/demo-include-ssl.config; @@ -45,7 +45,7 @@ server { } server { - listen 443 ssl http2; + listen 443 ssl; server_name gcr.t.khs1994.com; include conf.d/demo-include-ssl.config; diff --git a/config/nginx/demo.config/fzjh.config b/config/nginx/demo.config/fzjh.config index 10c1cdfba..f2b9cb7a7 100644 --- a/config/nginx/demo.config/fzjh.config +++ b/config/nginx/demo.config/fzjh.config @@ -5,7 +5,7 @@ upstream fzjh { } server { - listen 443 ssl http2; + listen 443 ssl; server_name fzjh.t.khs1994.com; location / { proxy_pass http://fzjh; diff --git a/config/nginx/demo.config/gitlab.config b/config/nginx/demo.config/gitlab.config index 2f28f0af1..c0f2d961a 100644 --- a/config/nginx/demo.config/gitlab.config +++ b/config/nginx/demo.config/gitlab.config @@ -3,7 +3,7 @@ upstream gitlab_server { } server { - listen 443 ssl http2; + listen 443 ssl; # # please edit diff --git a/config/nginx/demo.config/gogs.config b/config/nginx/demo.config/gogs.config index 3813cb8c0..f2ef8dbdf 100644 --- a/config/nginx/demo.config/gogs.config +++ b/config/nginx/demo.config/gogs.config @@ -3,7 +3,7 @@ upstream git { } server { - listen 443 ssl http2; + listen 443 ssl; server_name git.t.khs1994.com; ssl_certificate conf.d/demo-ssl/t.khs1994.com.crt; ssl_certificate_key conf.d/demo-ssl/t.khs1994.com.key; diff --git a/config/nginx/demo.config/http3.config b/config/nginx/demo.config/http3.config index 5826086a0..576914077 100644 --- a/config/nginx/demo.config/http3.config +++ b/config/nginx/demo.config/http3.config @@ -13,7 +13,7 @@ server { # Enable QUIC and HTTP/3. listen 443 quic reuseport; # Ensure that HTTP/2 is enabled for the server - listen 443 ssl http2; + listen 443 ssl; server_name localhost; http2_push_preload on; diff --git a/config/nginx/demo.config/laravel.config b/config/nginx/demo.config/laravel.config index 1697b9948..6da739089 100644 --- a/config/nginx/demo.config/laravel.config +++ b/config/nginx/demo.config/laravel.config @@ -14,7 +14,7 @@ server { # server { - listen 443 ssl http2; + listen 443 ssl; server_name laravel.t.khs1994.com; root /app/laravel/public; index index.html index.htm index.php; diff --git a/config/nginx/demo.config/minio.config b/config/nginx/demo.config/minio.config index 304a47694..ad8054232 100644 --- a/config/nginx/demo.config/minio.config +++ b/config/nginx/demo.config/minio.config @@ -1,5 +1,5 @@ server { - listen 443 ssl http2; + listen 443 ssl; server_name minio.t.khs1994.com minio.local; location / { proxy_buffering off; diff --git a/config/nginx/demo.config/ppm.config b/config/nginx/demo.config/ppm.config index fc4c31372..195951cdc 100644 --- a/config/nginx/demo.config/ppm.config +++ b/config/nginx/demo.config/ppm.config @@ -1,5 +1,5 @@ server { - listen 443 ssl http2; + listen 443 ssl; server_name laravel.t.khs1994.com; root /app/laravel/public; diff --git a/dockerfile/nginx/conf.d/http3-quic.conf b/dockerfile/nginx/conf.d/http3-quic.conf index 6af1559f8..3296e473d 100644 --- a/dockerfile/nginx/conf.d/http3-quic.conf +++ b/dockerfile/nginx/conf.d/http3-quic.conf @@ -42,7 +42,7 @@ server{ server{ # listen 443 ssl; - listen 443 ssl http2; + listen 443 ssl; # http3 只能在一个 server 中配置 # listen 443 http3 reuseport; # UDP listener for QUIC+HTTP/3 server_name quic2.t.khs1994.com; diff --git a/docs/nginx/https.md b/docs/nginx/https.md index 903b2b328..cadbf613b 100644 --- a/docs/nginx/https.md +++ b/docs/nginx/https.md @@ -17,7 +17,7 @@ server { } server{ - listen 443 ssl http2; + listen 443 ssl; server_name www.t.khs1994.com; # 「重要」 此处为容器内路径（注意不是本机路径）！ 本机 ./app/ 对应容器内 /app/ diff --git a/drone/config/nginx/demo-drone.config b/drone/config/nginx/demo-drone.config index 708336fd7..8a73d26ad 100644 --- a/drone/config/nginx/demo-drone.config +++ b/drone/config/nginx/demo-drone.config @@ -9,7 +9,7 @@ server { } server { - listen 443 ssl http2; + listen 443 ssl; server_name drone.{{ CI_DOMAIN }}; ssl_certificate conf.d/ssl/{{ CI_DOMAIN }}.crt; ssl_certificate_key conf.d/ssl/{{ CI_DOMAIN }}.key; diff --git a/kubernetes/lnmp/config/configMap/nginx-conf-d/t.khs1994.com.conf b/kubernetes/lnmp/config/configMap/nginx-conf-d/t.khs1994.com.conf index 53614729c..0098aa1c7 100644 --- a/kubernetes/lnmp/config/configMap/nginx-conf-d/t.khs1994.com.conf +++ b/kubernetes/lnmp/config/configMap/nginx-conf-d/t.khs1994.com.conf @@ -10,7 +10,7 @@ server { server { # listen 443 quic reuseport; - listen 443 ssl http2; + listen 443 ssl; server_name laravel.t.khs1994.com laravel2.t.khs1994.com; index index.php index.html; @@ -44,7 +44,7 @@ server { } server { - listen 443 ssl http2; + listen 443 ssl; server_name www.t.khs1994.com; index index.php index.html; @@ -78,7 +78,7 @@ server { } server { - listen 443 ssl http2; + listen 443 ssl; server_name test.t.khs1994.com; index index.php index.html; diff --git a/kubernetes/lnmp/nginx/overlays/development/config/conf.d/t.khs1994.com.development.conf b/kubernetes/lnmp/nginx/overlays/development/config/conf.d/t.khs1994.com.development.conf index 24d8d88f0..db6cfff47 100644 --- a/kubernetes/lnmp/nginx/overlays/development/config/conf.d/t.khs1994.com.development.conf +++ b/kubernetes/lnmp/nginx/overlays/development/config/conf.d/t.khs1994.com.development.conf @@ -8,7 +8,7 @@ server { } server { - listen 443 ssl http2; + listen 443 ssl; server_name development.t.khs1994.com laravel.t.khs1994.com laravel2.t.khs1994.com; index index.php index.html; @@ -42,7 +42,7 @@ server { } server { - listen 443 ssl http2; + listen 443 ssl; server_name www.t.khs1994.com; index index.php index.html; @@ -76,7 +76,7 @@ server { } server { - listen 443 ssl http2; + listen 443 ssl; server_name test.t.khs1994.com; index index.php index.html; diff --git a/kubernetes/lnmp/nginx/overlays/production/config/conf.d/t.khs1994.com.production.conf b/kubernetes/lnmp/nginx/overlays/production/config/conf.d/t.khs1994.com.production.conf index 6273e6aba..7d2d69b4b 100644 --- a/kubernetes/lnmp/nginx/overlays/production/config/conf.d/t.khs1994.com.production.conf +++ b/kubernetes/lnmp/nginx/overlays/production/config/conf.d/t.khs1994.com.production.conf @@ -8,7 +8,7 @@ server { } server { - listen 443 ssl http2; + listen 443 ssl; server_name production.t.khs1994.com laravel.t.khs1994.com laravel2.t.khs1994.com; index index.php index.html; @@ -42,7 +42,7 @@ server { } server { - listen 443 ssl http2; + listen 443 ssl; server_name www.t.khs1994.com; index index.php index.html; @@ -76,7 +76,7 @@ server { } server { - listen 443 ssl http2; + listen 443 ssl; server_name test.t.khs1994.com; index index.php index.html; diff --git a/lnmp-docker b/lnmp-docker index 0b9d31b1e..a651270c0 100755 --- a/lnmp-docker +++ b/lnmp-docker @@ -593,7 +593,7 @@ server { } server{ - listen 443 ssl http2; + listen 443 ssl; server_name $1; root ${LNMP_PHP_PATH:-/app}/$2; index index.html index.htm index.php; @@ -1530,7 +1530,23 @@ $ ./lnmp-docker ssl-self khs1994.com *.khs1994.com *.t.khs1994.com 127.0.0.1 ... ;; pwsh ) - print_info "please open https://docs.microsoft.com/zh-cn/powershell/scripting/install/installing-powershell-core-on-linux?view=powershell-7.1" + command -v pwsh && pwsh || true + command -v pwsh && exit || true + if [ $OS = 'Darwin' ];then + # Download the powershell '.tar.gz' archive + curl -L -o $HOME/Downloads/powershell.tar.gz https://github.com/PowerShell/PowerShell/releases/download/v7.3.9/powershell-7.3.9-osx-x64.tar.gz + # Create the target folder where powershell is placed + sudo mkdir -p /usr/local/microsoft/powershell/7.3.9 + # Expand powershell to the target folder + sudo tar zxf $HOME/Downloads/powershell.tar.gz -C /usr/local/microsoft/powershell/7.3.9 + # Set execute permissions + sudo chmod +x /usr/local/microsoft/powershell/7.3.9/pwsh + # Create the symbolic link that points to pwsh + sudo ln -s /usr/local/microsoft/powershell/7.3.9/pwsh /usr/local/bin/pwsh + exit + fi + + print_info "please open https://docs.microsoft.com/zh-cn/powershell/scripting/install/installing-powershell-core-on-linux?view=powershell-7.3" ;; * ) diff --git a/lrew/laravel/config/laravel.conf b/lrew/laravel/config/laravel.conf index 074fbeaa2..45c76b78a 100644 --- a/lrew/laravel/config/laravel.conf +++ b/lrew/laravel/config/laravel.conf @@ -1,5 +1,5 @@ server { - listen 443 ssl http2; + listen 443 ssl; server_name laravel-docker.t.khs1994.com; diff --git a/lrew/pcit/conf/pcit.config b/lrew/pcit/conf/pcit.config index b0a58ff15..99e393626 100644 --- a/lrew/pcit/conf/pcit.config +++ b/lrew/pcit/conf/pcit.config @@ -1,7 +1,7 @@ server { # 更改端口号 - listen 10000 ssl http2; + listen 10000 ssl; # 更改 CI 的域名 diff --git a/lrew/pcit/conf/pcit.fpm.config b/lrew/pcit/conf/pcit.fpm.config index fd9d27522..6a37772a5 100644 --- a/lrew/pcit/conf/pcit.fpm.config +++ b/lrew/pcit/conf/pcit.fpm.config @@ -1,7 +1,7 @@ server { # 更改端口号 - listen 10000 ssl http2; + listen 10000 ssl; # 更改 CI 的域名 diff --git a/lrew/pcit/conf/pcit.proxy.frontend.config b/lrew/pcit/conf/pcit.proxy.frontend.config index 491e0aca8..f0170fad1 100644 --- a/lrew/pcit/conf/pcit.proxy.frontend.config +++ b/lrew/pcit/conf/pcit.proxy.frontend.config @@ -1,7 +1,7 @@ server { # 更改端口号 - listen 10000 ssl http2; + listen 10000 ssl; # 更改 CI 的域名 diff --git a/windows/config/nginx/www.conf b/windows/config/nginx/www.conf index 4d6ea9c9d..ac6c55757 100644 --- a/windows/config/nginx/www.conf +++ b/windows/config/nginx/www.conf @@ -3,7 +3,7 @@ upstream fastcgi_php { } server { - listen 443 ssl http2; + listen 443 ssl; server_name demo.t.khs1994.com; root C:/Users/90621/lnmp/app/demo/public; diff --git a/windows/config/nginx/www.container.config b/windows/config/nginx/www.container.config index 38da9ec48..f9378d335 100644 --- a/windows/config/nginx/www.container.config +++ b/windows/config/nginx/www.container.config @@ -8,7 +8,7 @@ upstream fastcgi_php { } server { - listen 443 ssl http2; + listen 443 ssl; server_name demo.t.khs1994.com; root C:/Users/90621/lnmp/app/demo/public; diff --git a/wsl/nginx/demo-ssl.config b/wsl/nginx/demo-ssl.config index 90d4ff46b..4941182f7 100644 --- a/wsl/nginx/demo-ssl.config +++ b/wsl/nginx/demo-ssl.config @@ -1,4 +1,4 @@ -# listen 443 ssl http2; +# listen 443 ssl; ssl_certificate conf.d/demo-ssl/t.khs1994.com.crt; ssl_certificate_key conf.d/demo-ssl/t.khs1994.com.key; From 4587a0adff4e4b2dcf4a94b93cf292b1547f268a Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 10 Feb 2024 10:32:07 +0800 Subject: [PATCH 26/42] [lwpm] Update soft version Signed-off-by: Kang Huaishuai --- scripts/issue.tls.sh | 10 +++---- windows/lnmp-windows-pm-repo/7zip/lwpm.json | 2 +- .../lnmp-windows-pm-repo/edge-beta/lwpm.json | 27 +++++++++++++++++++ .../edge-canary/lwpm.json | 27 +++++++++++++++++++ .../lnmp-windows-pm-repo/edge-dev/lwpm.json | 27 +++++++++++++++++++ windows/lnmp-windows-pm-repo/edge/lwpm.json | 8 +++--- windows/lnmp-windows-pm-repo/gpg/lwpm.json | 4 +-- windows/lnmp-windows-pm-repo/idea/lwpm.json | 4 +-- windows/lnmp-windows-pm-repo/wechat/lwpm.json | 6 ++--- 9 files changed, 95 insertions(+), 20 deletions(-) create mode 100644 windows/lnmp-windows-pm-repo/edge-beta/lwpm.json create mode 100644 windows/lnmp-windows-pm-repo/edge-canary/lwpm.json create mode 100644 windows/lnmp-windows-pm-repo/edge-dev/lwpm.json diff --git a/scripts/issue.tls.sh b/scripts/issue.tls.sh index eb0dc5023..e43665323 100644 --- a/scripts/issue.tls.sh +++ b/scripts/issue.tls.sh @@ -4,25 +4,21 @@ if [ $1 = 'rsa' ];then lnmp-docker ssl khs1994.com -d *.khs1994.com \ -d *.developer.khs1994.com \ -d *.home.khs1994.com \ - -d *.baidu.khs1994.com \ - -d *.alibaba.khs1994.com \ - -d *.tencent.khs1994.com \ -d *.cxyl.khs1994.com \ -d *.ci.khs1994.com \ -d *.ci2.khs1994.com \ -d *.mirrors.khs1994.com -d *.mirror.khs1994.com \ -d docker-practice.com -d *.docker-practice.com \ + -d local.khs1994.com -d *.local.khs1994.com \ --rsa fi lnmp-docker ssl khs1994.com -d *.khs1994.com \ -d *.developer.khs1994.com \ -d *.home.khs1994.com \ - -d *.baidu.khs1994.com \ - -d *.alibaba.khs1994.com \ - -d *.tencent.khs1994.com \ + -d *.cxyl.khs1994.com \ -d *.ci.khs1994.com \ -d *.ci2.khs1994.com \ -d *.mirrors.khs1994.com -d *.mirror.khs1994.com \ -d docker-practice.com -d *.docker-practice.com \ - -d *.cxyl.khs1994.com + -d local.khs1994.com -d *.local.khs1994.com diff --git a/windows/lnmp-windows-pm-repo/7zip/lwpm.json b/windows/lnmp-windows-pm-repo/7zip/lwpm.json index cbc7d185a..cdef07e9b 100644 --- a/windows/lnmp-windows-pm-repo/7zip/lwpm.json +++ b/windows/lnmp-windows-pm-repo/7zip/lwpm.json @@ -2,7 +2,7 @@ "name": "7zip", "description": "7-Zip is a file archiver with a high compression ratio", "version": "2301", - "pre-version": "2301", + "pre-version": "2401", "homepage": "https://www.7-zip.org/", "bug": "https://www.7-zip.org/support.html", "github": "", diff --git a/windows/lnmp-windows-pm-repo/edge-beta/lwpm.json b/windows/lnmp-windows-pm-repo/edge-beta/lwpm.json new file mode 100644 index 000000000..65f5a7ea4 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/edge-beta/lwpm.json @@ -0,0 +1,27 @@ +{ + "name": "edge-beta", + "description": "World-class performance with more privacy, more productivity, and more value while you browse.", + "version": "113.0.1774.50", + "pre-version": "", + "homepage": "https://www.microsoft.com/zh-cn/edge/download/insider", + "bug": "", + "github": "", + "releases": "https://www.microsoft.com/zh-cn/edge/download/insider", + "url": "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/f434ea34-14a1-4469-94e0-f96cf6e6426e/MicrosoftEdgeBetaEnterpriseX64.msi", + "url-mirror": "", + "winget-pkgs": "https://hub.nuaa.cf/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/Edge", + "scripts": { + "preinstall": "", + "install": "start-process $filename", + "postinstall": "", + "preuninstall": "", + "uninstall": "", + "postuninstall": "", + "pretest": "", + "test": "", + "posttest":"" + }, + "path": [ + + ] +} diff --git a/windows/lnmp-windows-pm-repo/edge-canary/lwpm.json b/windows/lnmp-windows-pm-repo/edge-canary/lwpm.json new file mode 100644 index 000000000..0098f9b2f --- /dev/null +++ b/windows/lnmp-windows-pm-repo/edge-canary/lwpm.json @@ -0,0 +1,27 @@ +{ + "name": "edge-canary", + "description": "World-class performance with more privacy, more productivity, and more value while you browse.", + "version": "113.0.1774.50", + "pre-version": "", + "homepage": "https://www.microsoft.com/zh-cn/edge/download/insider", + "bug": "", + "github": "", + "releases": "https://www.microsoft.com/zh-cn/edge/download/insider", + "url": "https://c2rsetup.edog.officeapps.live.com/c2r/downloadEdge.aspx?platform=Default&source=EdgeInsiderPage&Channel=Canary&language=en", + "url-mirror": "", + "winget-pkgs": "https://hub.nuaa.cf/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/Edge", + "scripts": { + "preinstall": "", + "install": "start-process $filename", + "postinstall": "", + "preuninstall": "", + "uninstall": "", + "postuninstall": "", + "pretest": "", + "test": "", + "posttest":"" + }, + "path": [ + + ] +} diff --git a/windows/lnmp-windows-pm-repo/edge-dev/lwpm.json b/windows/lnmp-windows-pm-repo/edge-dev/lwpm.json new file mode 100644 index 000000000..7a8d46ab8 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/edge-dev/lwpm.json @@ -0,0 +1,27 @@ +{ + "name": "edge-dev", + "description": "World-class performance with more privacy, more productivity, and more value while you browse.", + "version": "113.0.1774.50", + "pre-version": "", + "homepage": "https://www.microsoft.com/zh-cn/edge/download/insider", + "bug": "", + "github": "", + "releases": "https://www.microsoft.com/zh-cn/edge/download/insider", + "url": "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/4c083775-4193-4992-9db6-77f2c75ef88f/MicrosoftEdgeDevEnterpriseX64.msi", + "url-mirror": "", + "winget-pkgs": "https://hub.nuaa.cf/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/Edge", + "scripts": { + "preinstall": "", + "install": "start-process $filename", + "postinstall": "", + "preuninstall": "", + "uninstall": "", + "postuninstall": "", + "pretest": "", + "test": "", + "posttest":"" + }, + "path": [ + + ] +} diff --git a/windows/lnmp-windows-pm-repo/edge/lwpm.json b/windows/lnmp-windows-pm-repo/edge/lwpm.json index fc7a77020..b98962587 100644 --- a/windows/lnmp-windows-pm-repo/edge/lwpm.json +++ b/windows/lnmp-windows-pm-repo/edge/lwpm.json @@ -3,15 +3,13 @@ "description": "World-class performance with more privacy, more productivity, and more value while you browse.", "version": "113.0.1774.50", "pre-version": "", - "homepage": "https://www.microsoftedgeinsider.com", + "homepage": "https://www.microsoft.com/zh-cn/edge", "bug": "", "github": "", - "releases": "https://www.microsoftedgeinsider.com/en-us/download/", + "releases": "https://www.microsoft.com/zh-cn/edge/download", "url": "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/d9d8b4d4-0136-4c8f-8dfe-4c3ff29b2473/MicrosoftEdgeEnterpriseX64.msi", "url-mirror": "", - "pre-url": "https://c2rsetup.edog.officeapps.live.com/c2r/downloadEdge.aspx?platform=Default&source=EdgeInsiderPage&Channel=Canary&language=en", - "pre-url-mirror": "", - "winget-pkgs": "https://hub.fgit.ml/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/Edge", + "winget-pkgs": "https://hub.nuaa.cf/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/Edge", "scripts": { "preinstall": "", "install": "start-process $filename", diff --git a/windows/lnmp-windows-pm-repo/gpg/lwpm.json b/windows/lnmp-windows-pm-repo/gpg/lwpm.json index 791fbf445..06b7ba4ae 100644 --- a/windows/lnmp-windows-pm-repo/gpg/lwpm.json +++ b/windows/lnmp-windows-pm-repo/gpg/lwpm.json @@ -1,8 +1,8 @@ { "name": "gpg", "description": "", - "version": "4.1.0", - "pre-version": "4.1.0", + "version": "4.3.0", + "pre-version": "4.3.0", "homepage": "https://gnupg.org/", "bug": "", "github": "gpg/gpg4win", diff --git a/windows/lnmp-windows-pm-repo/idea/lwpm.json b/windows/lnmp-windows-pm-repo/idea/lwpm.json index 849598f1d..70b372e5d 100644 --- a/windows/lnmp-windows-pm-repo/idea/lwpm.json +++ b/windows/lnmp-windows-pm-repo/idea/lwpm.json @@ -1,8 +1,8 @@ { "name": "idea", "description": "Manage your tools the easy way", - "version": "1.28.1.15219", - "pre-version": "1.28.1.15219", + "version": "2.2.1.19765", + "pre-version": "2.2.1.19765", "homepage": "https://www.jetbrains.com/", "bug": "", "github": "", diff --git a/windows/lnmp-windows-pm-repo/wechat/lwpm.json b/windows/lnmp-windows-pm-repo/wechat/lwpm.json index 13d9c0ef5..72ba87fcf 100644 --- a/windows/lnmp-windows-pm-repo/wechat/lwpm.json +++ b/windows/lnmp-windows-pm-repo/wechat/lwpm.json @@ -8,14 +8,14 @@ "github": "", "releases": "", "url": "https://dldir1.qq.com/weixin/$(if($IsMacOs){echo mac/WeChatMac.dmg}else{echo Windows/WeChatSetup.exe})", - "command": "${env:ProgramFiles(x86)}\\Tencent\\WeChat\\WeChat.exe", + "command": "${env:ProgramFiles}\\Tencent\\WeChat\\WeChat.exe", "scripts": { "platform-reqs": [ "if(!($IsWindows -or $IsMacOs)){echo $False}" ], "install": "Start-Process -FilePath $filename -wait", - "uninstall": "& ${env:ProgramFiles(x86)}\\Tencent\\WeChat\\Uninstall.exe", + "uninstall": "& ${env:ProgramFiles}\\Tencent\\WeChat\\Uninstall.exe", "version": "echo ${VERSION}", - "test": "if($IsWindows){& get-command ${env:ProgramFiles(x86)}\\Tencent\\WeChat\\WeChat.exe}" + "test": "if($IsWindows){& get-command ${env:ProgramFiles}\\Tencent\\WeChat\\WeChat.exe}" } } From 973459fa21b1262f5bf6819562b8f2ce06288a07 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 10 Feb 2024 10:39:39 +0800 Subject: [PATCH 27/42] [PHP] Update to v8.2.0 v8.1.23 v8.0.29 Signed-off-by: Kang Huaishuai --- .env.example | 10 +-- .env.example.ps1 | 2 +- .../setup-php/.github/workflows/ci.yaml | 6 +- .github/actions/setup-php/action.yml | 2 +- .github/actions/setup-php/package.json | 2 +- .github/workflows/release.yaml | 36 +++++----- .pcit.yml | 2 +- CHANGELOG.md | 5 +- README.cn.md | 6 +- README.md | 6 +- app/demo/.drone.yml | 16 ++--- app/demo/.env.example | 6 +- app/demo/.github/workflows/ci.yml | 2 +- app/demo/.pcit.yml | 10 +-- app/demo/Dockerfile | 4 +- app/demo/deploy/test.Dockerfile | 2 +- app/demo/docker-compose.yml | 6 +- app/demo/docker-workspace.yml | 4 +- app/laravel-demo/Dockerfile | 4 +- app/laravel-demo/Dockerfile.buildkit | 4 +- app/laravel-demo/Dockerfile.cdn | 4 +- docker-lnmp.override.example.yml | 8 +-- docker-lnmp.yml | 4 +- docker-production.yml | 4 +- docker-workspace.example.yml | 4 +- dockerfile/php/.env.example | 6 +- dockerfile/php/.github/workflows/php_8_0.yml | 4 +- dockerfile/php/.github/workflows/php_8_1.yml | 4 +- dockerfile/php/.github/workflows/php_8_2.yml | 4 +- .../php/.github/workflows/php_zz_tool.yml | 4 +- dockerfile/php/8.0/cli/Dockerfile | 4 +- dockerfile/php/8.0/composer/Dockerfile | 2 +- dockerfile/php/8.0/fpm/Dockerfile | 2 +- dockerfile/php/8.0/s6/Dockerfile | 2 +- dockerfile/php/8.0/swoole/Dockerfile | 4 +- dockerfile/php/8.0/unit/Dockerfile | 2 +- dockerfile/php/8.1/cli/Dockerfile | 4 +- dockerfile/php/8.1/composer/Dockerfile | 2 +- dockerfile/php/8.1/fpm/Dockerfile | 2 +- dockerfile/php/8.1/s6/Dockerfile | 2 +- dockerfile/php/8.1/swoole/Dockerfile | 4 +- dockerfile/php/8.1/unit/Dockerfile | 2 +- dockerfile/php/8.2/cli/Dockerfile | 4 +- dockerfile/php/8.2/composer/Dockerfile | 2 +- dockerfile/php/8.2/fpm/Dockerfile | 2 +- dockerfile/php/8.2/s6/Dockerfile | 2 +- dockerfile/php/8.2/swoole/Dockerfile | 4 +- dockerfile/php/8.2/unit/Dockerfile | 2 +- dockerfile/php/README.md | 26 +++---- dockerfile/php/doctum/Dockerfile | 2 +- dockerfile/php/php-cs-fixer/Dockerfile | 2 +- dockerfile/php/phpmd/Dockerfile | 2 +- dockerfile/php/sync/docker-image-sync.json | 36 +++++----- dockerfile/php/sync/manifest.txt | 36 +++++----- docs/custom.md | 4 +- kubernetes/lnmp/php/base/lnmp-php.yaml | 2 +- lrew/nginx-unit/docker-compose.yml | 2 +- scripts/docker-compose.bump.yml | 2 +- vscode-remote/docker-workspace.yml | 4 +- windows/lnmp-windows-pm-repo/php/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/php/lwpm.yaml | 4 +- wsl/.env | 6 +- wsl/Dockerfile | 2 +- wsl/docker-compose.yml | 72 +++++++++---------- wsl/lnmp-wsl-builder-php | 2 +- wsl/lnmp-wsl-builder-php-rhel | 2 +- wsl/wsl.phpbuilder.Dockerfile | 2 +- wsl/wsl.phpbuilder.rhel.Dockerfile | 2 +- 68 files changed, 220 insertions(+), 223 deletions(-) diff --git a/.env.example b/.env.example index f2b1d256d..614b2906b 100644 --- a/.env.example +++ b/.env.example @@ -123,7 +123,7 @@ LNMP_NGINX_VERSION=1.25.1 LNMP_MYSQL_VERSION=8.0.33 -LNMP_PHP_VERSION=8.2.5 +LNMP_PHP_VERSION=8.2.10 # LNMP_PHP_VERSION=nightly # PHP EOL VERSION @@ -137,10 +137,10 @@ LNMP_PHP73_VERSION=7.3.33 LNMP_PHP74_VERSION=7.4.33 # PHP EOL VERSION END -LNMP_PHP8_VERSION=8.2.5 -LNMP_PHP80_VERSION=8.0.28 -LNMP_PHP81_VERSION=8.1.15 -LNMP_PHP82_VERSION=8.2.5 +LNMP_PHP8_VERSION=8.2.10 +LNMP_PHP80_VERSION=8.0.30 +LNMP_PHP81_VERSION=8.1.23 +LNMP_PHP82_VERSION=8.2.10 LNMP_PHP83_VERSION=8.3.0beta1 LNMP_REDIS_VERSION=7.0.0 diff --git a/.env.example.ps1 b/.env.example.ps1 index 269c45bc7..55d53799c 100644 --- a/.env.example.ps1 +++ b/.env.example.ps1 @@ -7,7 +7,7 @@ $CI_HOST="ci.khs1994.com:1218" # $ wsl -l $DistributionName="Ubuntu-22.04" -$LNMP_PHP_IMAGE="khs1994/php:8.2.5-composer-alpine" +$LNMP_PHP_IMAGE="khs1994/php:8.2.10-composer-alpine" $NGINX_PATH="C:/nginx" $PHP_PATH="C:/php" diff --git a/.github/actions/setup-php/.github/workflows/ci.yaml b/.github/actions/setup-php/.github/workflows/ci.yaml index 2e95105c2..ecfaf874f 100644 --- a/.github/actions/setup-php/.github/workflows/ci.yaml +++ b/.github/actions/setup-php/.github/workflows/ci.yaml @@ -10,9 +10,9 @@ jobs: matrix: php_version: - nightly - - 8.2.5 - - 8.1.15 - - 8.0.28 + - 8.2.10 + - 8.1.23 + - 8.0.30 # EOL - 7.4.33 - 7.3.33 diff --git a/.github/actions/setup-php/action.yml b/.github/actions/setup-php/action.yml index 73454a06f..02fa2959c 100644 --- a/.github/actions/setup-php/action.yml +++ b/.github/actions/setup-php/action.yml @@ -6,7 +6,7 @@ author: 'khs1994' inputs: php_version: description: PHP version - default: "8.2.5" + default: "8.2.10" required: false php_type: description: php image type, fpm | composer | swoole | php-cs-fixer | doctum diff --git a/.github/actions/setup-php/package.json b/.github/actions/setup-php/package.json index 08cb8456f..fb719b8be 100644 --- a/.github/actions/setup-php/package.json +++ b/.github/actions/setup-php/package.json @@ -12,7 +12,7 @@ }, "devDependencies": {}, "scripts": { - "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.2.5' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" + "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.2.10' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" }, "author": "", "license": "ISC" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 98fc67bbc..cd6c1b9d7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,59 +16,59 @@ jobs: - 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.28-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.30-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-81 - DIST_FILE: khs1994-wsl-php81_8.1.15-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.23-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-nightly DIST_FILE: khs1994-wsl-php83_0.0.0-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-debian12-81 - DIST_FILE: khs1994-wsl-php81_8.1.15-debian-bookworm_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.23-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.28-ubuntu-bionic_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.30-ubuntu-bionic_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu1804-81 - DIST_FILE: khs1994-wsl-php81_8.1.15-ubuntu-bionic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.23-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.28-ubuntu-focal_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.30-ubuntu-focal_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2004-81 - DIST_FILE: khs1994-wsl-php81_8.1.15-ubuntu-focal_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.23-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.28-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php80_8.0.30-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-81 - DIST_FILE: khs1994-wsl-php81_8.1.15-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.23-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-nightly DIST_FILE: khs1994-wsl-php83_0.0.0-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2210-81 - DIST_FILE: khs1994-wsl-php81_8.1.15-ubuntu-kinetic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.23-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.28-1.el8.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.30-1.el8.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel8-81 - DIST_FILE: khs1994-wsl-php81-8.1.15-1.el8.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.23-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.28-1.el9.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.30-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rhel9-81 - DIST_FILE: khs1994-wsl-php81-8.1.15-1.el9.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.23-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky8-81 - DIST_FILE: khs1994-wsl-php81-8.1.15-1.el8.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.23-1.el8.rocky.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky9-81 - DIST_FILE: khs1994-wsl-php81-8.1.15-1.el9.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.23-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.28-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php80-8.0.30-1.fc36.x86_64.rpm - JOB_NAME: wsl-php-builder-fc36-81 - DIST_FILE: khs1994-wsl-php81-8.1.15-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.23-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 - JOB_NAME: wsl-php-builder-fc37-nightly diff --git a/.pcit.yml b/.pcit.yml index 9934edb8b..44552e830 100644 --- a/.pcit.yml +++ b/.pcit.yml @@ -4,7 +4,7 @@ workspace: steps: bash: - image: khs1994/php:8.2.5-composer-alpine + image: khs1994/php:8.2.10-composer-alpine run: - pwd - bash ./lnmp-docker diff --git a/CHANGELOG.md b/CHANGELOG.md index e7934b95a..605c5165c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,6 @@ ### Changes: -* Require Compose v2.17.0+ - ### Updates: -* [PHP `8.2.5` `8.1.15` `8.0.28`](https://www.php.net/ChangeLog-8.php#8.1.15) -* [Nginx `1.25.1`](https://nginx.org/en/CHANGES) +* [PHP `8.2.10` `8.1.23` `8.0.29`](https://www.php.net/ChangeLog-8.php#8.1.23) diff --git a/README.cn.md b/README.cn.md index c2c252f3e..c402f1fd3 100644 --- a/README.cn.md +++ b/README.cn.md @@ -211,13 +211,13 @@ $ ./lnmp-docker down |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.1-alpine` | **1.25.1** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.5-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.10-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.5` | **10.11.5** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.5-fpm-alpine` | **8.2.5** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.5-composer-alpine`| **2.5.8** |`alpine:3.16` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.10-fpm-alpine` | **8.2.10** |`alpine:3.16` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.10-composer-alpine`| **2.5.8** |`alpine:3.16` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/README.md b/README.md index 05438458f..a3d7e5dc7 100644 --- a/README.md +++ b/README.md @@ -206,13 +206,13 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.1-alpine` | **1.25.1** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.5-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.10-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.5` | **10.11.5** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.5-fpm-alpine` | **8.2.5** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.5-composer-alpine`| **2.5.8** |`alpine:3.16` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.10-fpm-alpine` | **8.2.10** |`alpine:3.16` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.10-composer-alpine`| **2.5.8** |`alpine:3.16` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/app/demo/.drone.yml b/app/demo/.drone.yml index f1cb95947..78b564ff1 100644 --- a/app/demo/.drone.yml +++ b/app/demo/.drone.yml @@ -34,7 +34,7 @@ steps: # install dep - name: install # image: composer:2.5.8 - image: khs1994/php:8.2.5-composer-alpine + image: khs1994/php:8.2.10-composer-alpine commands: - pwd - composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/ @@ -46,7 +46,7 @@ steps: # test script - name: script - image: khs1994/php:8.2.5-fpm-alpine + image: khs1994/php:8.2.10-fpm-alpine # pull: always | never | if-not-exists # detach: true # privileged: true @@ -92,7 +92,7 @@ steps: settings: # registry: docker.khs1994.com repo: khs1994/php - tags: 8.2.5-pro-${DRONE_TAG}-alpine + tags: 8.2.10-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com # build_args: @@ -142,7 +142,7 @@ steps: image: plugins/docker settings: repo: khs1994/php - tags: 8.2.5-pro-${DRONE_TAG}-alpine + tags: 8.2.10-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com username: @@ -179,7 +179,7 @@ steps: event: [ tag ] - name: after_success - image: khs1994/php:8.2.5-composer-alpine + image: khs1994/php:8.2.10-composer-alpine when: status: success commands: @@ -228,9 +228,9 @@ volumes: # COMPOSER_VERSION: # - 2.5.8 # PHP_VERSION: -# - 8.2.5 -# - 8.1.15 -# - 8.0.28 +# - 8.2.10 +# - 8.1.23 +# - 8.0.30 # # - 7.4.33 # # - 7.3.33 # # - 7.2.34 diff --git a/app/demo/.env.example b/app/demo/.env.example index 14eed6e57..e7fef36c9 100644 --- a/app/demo/.env.example +++ b/app/demo/.env.example @@ -1,8 +1,8 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION=8.2.5 -# PHP_VERSION=8.1.15 -# PHP_VERSION=8.0.28 +PHP_VERSION=8.2.10 +# PHP_VERSION=8.1.23 +# PHP_VERSION=8.0.30 # PHP_VERSION=7.4.33 # PHP_VERSION=7.3.33 # PHP_VERSION=7.2.34 diff --git a/app/demo/.github/workflows/ci.yml b/app/demo/.github/workflows/ci.yml index a9fd85206..ec162f597 100644 --- a/app/demo/.github/workflows/ci.yml +++ b/app/demo/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: test: strategy: matrix: - php_version: ["8.0.28","8.1.15","8.2.5"] + php_version: ["8.0.30","8.1.23","8.2.10"] runs-on: ubuntu-latest # needs: job steps: diff --git a/app/demo/.pcit.yml b/app/demo/.pcit.yml index e26fdc126..dde14f2bf 100644 --- a/app/demo/.pcit.yml +++ b/app/demo/.pcit.yml @@ -16,7 +16,7 @@ steps: # install dep install: # image: composer:${COMPOSER_VERSION} - image: khs1994/php:8.2.5-composer-alpine + image: khs1994/php:8.2.10-composer-alpine shell: bash run: - pwd @@ -80,7 +80,7 @@ steps: event: tag after_success: - image: khs1994/php:8.2.5-composer-alpine + image: khs1994/php:8.2.10-composer-alpine shell: bash if: status: success @@ -129,9 +129,9 @@ jobs: COMPOSER_VERSION: - 2.5.8 PHP_VERSION: - - 8.2.5 - - 8.1.15 - - 8.0.28 + - 8.2.10 + - 8.1.23 + - 8.0.30 # - 7.4.33 # - 7.3.33 # - 7.2.34 diff --git a/app/demo/Dockerfile b/app/demo/Dockerfile index cb8fa0d70..28ebc17d3 100644 --- a/app/demo/Dockerfile +++ b/app/demo/Dockerfile @@ -9,7 +9,7 @@ # !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !! ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG NGINX_VERSION=1.15.0 ARG DOCKER_HUB_USERNAME=khs1994 @@ -28,7 +28,7 @@ RUN cd /app \ --no-plugins # 2.将项目打入 PHP 镜像 -# $ docker build -t khs1994/php:8.2.5-pro-GIT_TAG-alpine --target=php . +# $ docker build -t khs1994/php:8.2.10-pro-GIT_TAG-alpine --target=php . FROM ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION}-fpm-alpine as php diff --git a/app/demo/deploy/test.Dockerfile b/app/demo/deploy/test.Dockerfile index df024b86e..1f26f4dbf 100644 --- a/app/demo/deploy/test.Dockerfile +++ b/app/demo/deploy/test.Dockerfile @@ -2,7 +2,7 @@ # TEST PHP PROJECT BY Docker # -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG GIT_REPO={{ EXAMPLE_GIT_URL_EXAMPLE }}/{{ EXAMPLE_GIT_USERNAME_EXAMPLE }}/{{ EXAMPLE_GIT_REPO_EXAMPLE }}.git FROM khs1994/php:${PHP_VERSION}-composer-alpine diff --git a/app/demo/docker-compose.yml b/app/demo/docker-compose.yml index 9bcd72a3c..eba27032c 100644 --- a/app/demo/docker-compose.yml +++ b/app/demo/docker-compose.yml @@ -19,7 +19,7 @@ services: context: . dockerfile: deploy/test.Dockerfile args: - - PHP_VERSION=${PHP_VERSION:-8.2.5} + - PHP_VERSION=${PHP_VERSION:-8.2.10} image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE nginx: @@ -39,7 +39,7 @@ services: dockerfile: Dockerfile target: php args: - - PHP_VERSION=${PHP_VERSION:-8.2.5} + - PHP_VERSION=${PHP_VERSION:-8.2.10} - NODE_VERSION=${NODE_VERSION:-20.5.1} - NODE_REGISTRY=https://registry.npmmirror.com - image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.5}-pro-alpine + image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.10}-pro-alpine diff --git a/app/demo/docker-workspace.yml b/app/demo/docker-workspace.yml index a0e699a4d..0e375b5e8 100644 --- a/app/demo/docker-workspace.yml +++ b/app/demo/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.5-composer-alpine + image: khs1994/php:8.2.10-composer-alpine networks: - backend volumes: @@ -67,7 +67,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.5-composer-alpine" + image: "khs1994/php:8.2.10-composer-alpine" command: [] # install | update npm: diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index 4cf5eaf5a..f16d54044 100644 --- a/app/laravel-demo/Dockerfile +++ b/app/laravel-demo/Dockerfile @@ -14,12 +14,12 @@ # $ docker build --target=laravel -t khs1994/laravel:10 --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG NGINX_VERSION=1.25.1-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.5-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.10-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.buildkit b/app/laravel-demo/Dockerfile.buildkit index bc6c73ee3..812b4b125 100644 --- a/app/laravel-demo/Dockerfile.buildkit +++ b/app/laravel-demo/Dockerfile.buildkit @@ -16,12 +16,12 @@ # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.buildkit --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG NGINX_VERSION=1.25.1-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.5-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.10-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY --link composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.cdn b/app/laravel-demo/Dockerfile.cdn index c6e667237..6a6cfc91b 100644 --- a/app/laravel-demo/Dockerfile.cdn +++ b/app/laravel-demo/Dockerfile.cdn @@ -15,12 +15,12 @@ # # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.cdn --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG NGINX_VERSION=1.25.1-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.5-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.10-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/docker-lnmp.override.example.yml b/docker-lnmp.override.example.yml index 6af8db665..94a808957 100644 --- a/docker-lnmp.override.example.yml +++ b/docker-lnmp.override.example.yml @@ -27,11 +27,11 @@ services: # php8: # &php8 # # ! change php8 default image - # image: username/php:${LNMP_PHP8_VERSION:-8.2.5}-fpm-alpine + # image: username/php:${LNMP_PHP8_VERSION:-8.2.10}-fpm-alpine # # ! cn mirror image - # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.5}-fpm-alpine + # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.10}-fpm-alpine # # ! s6 - # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.5}-s6-alpine + # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.10}-s6-alpine # # command: [] # # ! open more port # ports: @@ -74,7 +74,7 @@ services: swoole: << : *common - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.5}-swoole-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.10}-swoole-alpine # command 指令只需传入文件名即可 command: - /app/swoole/index.php diff --git a/docker-lnmp.yml b/docker-lnmp.yml index deaad5894..bd8ae6100 100644 --- a/docker-lnmp.yml +++ b/docker-lnmp.yml @@ -169,7 +169,7 @@ services: php8: &php8 << : [*common,*common-labels] - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.5}-fpm-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.10}-fpm-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} @@ -220,7 +220,7 @@ services: composer: << : [*common,*common-labels] restart: "no" - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.5}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.10}-composer-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} diff --git a/docker-production.yml b/docker-production.yml index ace23be32..1c0e51fde 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -74,7 +74,7 @@ x-build-debian: x-php-common: &default-php - image: khs1994/php:8.2.5-fpm-alpine + image: khs1994/php:8.2.10-fpm-alpine volumes: - ./app:/app - type: volume @@ -364,7 +364,7 @@ services: - *common - *default-labels - *default-php - # image: khs1994/php:8.2.5-s6-alpine + # image: khs1994/php:8.2.10-s6-alpine # entrypoint: # - /s6-init build: diff --git a/docker-workspace.example.yml b/docker-workspace.example.yml index c9bdd35ee..49c3a0a14 100644 --- a/docker-workspace.example.yml +++ b/docker-workspace.example.yml @@ -11,7 +11,7 @@ x-common: services: workspace: &workspace - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.5}-composer-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.10}-composer-alpine networks: - backend volumes: @@ -71,7 +71,7 @@ services: << : - *workspace - *common - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.5}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.10}-composer-alpine" command: [] # install | update npm: diff --git a/dockerfile/php/.env.example b/dockerfile/php/.env.example index e67b78841..ab8258fec 100644 --- a/dockerfile/php/.env.example +++ b/dockerfile/php/.env.example @@ -1,9 +1,9 @@ DOCKER_HUB_USERNAME=khs1994 PHP_VERSION_83=8.3.0beta1 -PHP_VERSION_82=8.2.5 -PHP_VERSION_81=8.1.15 -PHP_VERSION_80=8.0.28 +PHP_VERSION_82=8.2.10 +PHP_VERSION_81=8.1.23 +PHP_VERSION_80=8.0.30 # EOL PHP_VERSION_74=7.4.33 PHP_VERSION_73=7.3.33 diff --git a/dockerfile/php/.github/workflows/php_8_0.yml b/dockerfile/php/.github/workflows/php_8_0.yml index b6badf359..4f2aeba82 100644 --- a/dockerfile/php/.github/workflows/php_8_0.yml +++ b/dockerfile/php/.github/workflows/php_8_0.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.0.28" + default: "8.0.30" name: PHP_8.0 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_0_X FOLDER: "8.0" - PHP_TAG_VERSION: "8.0.28" + PHP_TAG_VERSION: "8.0.30" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_8_1.yml b/dockerfile/php/.github/workflows/php_8_1.yml index 81b49043a..5b542c5df 100644 --- a/dockerfile/php/.github/workflows/php_8_1.yml +++ b/dockerfile/php/.github/workflows/php_8_1.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.1.15" + default: "8.1.23" name: PHP_8.1 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.15" + PHP_TAG_VERSION: "8.1.23" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_8_2.yml b/dockerfile/php/.github/workflows/php_8_2.yml index ef1ba4e18..733888b5c 100644 --- a/dockerfile/php/.github/workflows/php_8_2.yml +++ b/dockerfile/php/.github/workflows/php_8_2.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.2.5" + default: "8.2.10" name: PHP_8.2 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_2_X FOLDER: "8.2" - PHP_TAG_VERSION: "8.2.5" + PHP_TAG_VERSION: "8.2.10" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_zz_tool.yml b/dockerfile/php/.github/workflows/php_zz_tool.yml index 73c7cf837..42a9bc4db 100644 --- a/dockerfile/php/.github/workflows/php_zz_tool.yml +++ b/dockerfile/php/.github/workflows/php_zz_tool.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.1.15" + default: "8.1.23" name: PHP_TOOL @@ -180,7 +180,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.15" + PHP_TAG_VERSION: "8.1.23" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/8.0/cli/Dockerfile b/dockerfile/php/8.0/cli/Dockerfile index 34f6bcd21..15b624848 100644 --- a/dockerfile/php/8.0/cli/Dockerfile +++ b/dockerfile/php/8.0/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.28 +ARG PHP_VERSION=8.0.30 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.0.28 +ARG PHP_VERSION=8.0.30 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.0/composer/Dockerfile b/dockerfile/php/8.0/composer/Dockerfile index 73d41d802..8000bb87f 100644 --- a/dockerfile/php/8.0/composer/Dockerfile +++ b/dockerfile/php/8.0/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.28 +ARG PHP_VERSION=8.0.30 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.0/fpm/Dockerfile b/dockerfile/php/8.0/fpm/Dockerfile index eb6a0a8bc..375442553 100644 --- a/dockerfile/php/8.0/fpm/Dockerfile +++ b/dockerfile/php/8.0/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.28 +ARG PHP_VERSION=8.0.30 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.16 as php diff --git a/dockerfile/php/8.0/s6/Dockerfile b/dockerfile/php/8.0/s6/Dockerfile index 6c71779a0..dd7d54442 100644 --- a/dockerfile/php/8.0/s6/Dockerfile +++ b/dockerfile/php/8.0/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.28 +ARG PHP_VERSION=8.0.30 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.0/swoole/Dockerfile b/dockerfile/php/8.0/swoole/Dockerfile index 455ae456a..5d21e3b7f 100644 --- a/dockerfile/php/8.0/swoole/Dockerfile +++ b/dockerfile/php/8.0/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.28 +ARG PHP_VERSION=8.0.30 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.3 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.0.28-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.0.30-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.0/unit/Dockerfile b/dockerfile/php/8.0/unit/Dockerfile index 524be8967..34a3775af 100644 --- a/dockerfile/php/8.0/unit/Dockerfile +++ b/dockerfile/php/8.0/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.28 +ARG PHP_VERSION=8.0.30 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/8.1/cli/Dockerfile b/dockerfile/php/8.1/cli/Dockerfile index f4e5c7be7..bff8ff076 100644 --- a/dockerfile/php/8.1/cli/Dockerfile +++ b/dockerfile/php/8.1/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.15 +ARG PHP_VERSION=8.1.23 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.1.15 +ARG PHP_VERSION=8.1.23 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.1/composer/Dockerfile b/dockerfile/php/8.1/composer/Dockerfile index 53a7d3fca..f432e991b 100644 --- a/dockerfile/php/8.1/composer/Dockerfile +++ b/dockerfile/php/8.1/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.15 +ARG PHP_VERSION=8.1.23 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.1/fpm/Dockerfile b/dockerfile/php/8.1/fpm/Dockerfile index 210c14cfb..428dbd1a8 100644 --- a/dockerfile/php/8.1/fpm/Dockerfile +++ b/dockerfile/php/8.1/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.15 +ARG PHP_VERSION=8.1.23 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php diff --git a/dockerfile/php/8.1/s6/Dockerfile b/dockerfile/php/8.1/s6/Dockerfile index a7cf62038..a68fc559e 100644 --- a/dockerfile/php/8.1/s6/Dockerfile +++ b/dockerfile/php/8.1/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.15 +ARG PHP_VERSION=8.1.23 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.1/swoole/Dockerfile b/dockerfile/php/8.1/swoole/Dockerfile index 6483b172d..1b9ca16de 100644 --- a/dockerfile/php/8.1/swoole/Dockerfile +++ b/dockerfile/php/8.1/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.15 +ARG PHP_VERSION=8.1.23 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.3 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.1.15-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.1.23-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.1/unit/Dockerfile b/dockerfile/php/8.1/unit/Dockerfile index eb24a9797..c55cfaf34 100644 --- a/dockerfile/php/8.1/unit/Dockerfile +++ b/dockerfile/php/8.1/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.15 +ARG PHP_VERSION=8.1.23 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/8.2/cli/Dockerfile b/dockerfile/php/8.2/cli/Dockerfile index 17e16967a..add80fd75 100644 --- a/dockerfile/php/8.2/cli/Dockerfile +++ b/dockerfile/php/8.2/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.2/composer/Dockerfile b/dockerfile/php/8.2/composer/Dockerfile index b3c61b73c..9891d1dee 100644 --- a/dockerfile/php/8.2/composer/Dockerfile +++ b/dockerfile/php/8.2/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.2/fpm/Dockerfile b/dockerfile/php/8.2/fpm/Dockerfile index 3960066e5..6f8781e11 100644 --- a/dockerfile/php/8.2/fpm/Dockerfile +++ b/dockerfile/php/8.2/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php diff --git a/dockerfile/php/8.2/s6/Dockerfile b/dockerfile/php/8.2/s6/Dockerfile index a0eb4b714..f6659d9f6 100644 --- a/dockerfile/php/8.2/s6/Dockerfile +++ b/dockerfile/php/8.2/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.2/swoole/Dockerfile b/dockerfile/php/8.2/swoole/Dockerfile index 902b85f2e..9440baa57 100644 --- a/dockerfile/php/8.2/swoole/Dockerfile +++ b/dockerfile/php/8.2/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.3 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.2.5-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.2.10-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.2/unit/Dockerfile b/dockerfile/php/8.2/unit/Dockerfile index 68ad40e8c..14ff08d3f 100644 --- a/dockerfile/php/8.2/unit/Dockerfile +++ b/dockerfile/php/8.2/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/README.md b/dockerfile/php/README.md index af899165b..d6c0780e4 100644 --- a/dockerfile/php/README.md +++ b/dockerfile/php/README.md @@ -14,28 +14,28 @@ ## 后缀 -* 8.2.5-cli-alpine -* 8.2.5-fpm-alpine -* 8.2.5-unit-alpine (based cli) -* 8.2.5-composer-alpine (based fpm) -* 8.2.5-swoole-alpine (based cli) -* 8.2.5-s6-alpine (based fpm) +* 8.2.10-cli-alpine +* 8.2.10-fpm-alpine +* 8.2.10-unit-alpine (based cli) +* 8.2.10-composer-alpine (based fpm) +* 8.2.10-swoole-alpine (based cli) +* 8.2.10-s6-alpine (based fpm) ## Supported tags and respective `Dockerfile` links -* [`8.2.5-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/8.2/fpm/Dockerfile) +* [`8.2.10-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.2/fpm/Dockerfile) -* [`8.1.15-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/8.1/fpm/Dockerfile) +* [`8.1.23-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.1/fpm/Dockerfile) -* [`8.0.28-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/8.0/fpm/Dockerfile) +* [`8.0.30-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.0/fpm/Dockerfile) * [`nightly-fpm-alpine` (nightly/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/master/nightly/fpm/Dockerfile) -* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/7.4/fpm/Dockerfile) +* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.4/fpm/Dockerfile) -* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/7.3/fpm/Dockerfile) +* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.3/fpm/Dockerfile) -* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.5/7.2/fpm/Dockerfile) +* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.2/fpm/Dockerfile) ## Overview @@ -168,7 +168,7 @@ $ for ext in `ls /usr/src/php/ext`; do echo '*' $( php -r "if(extension_loaded(' * https://sources.debian.org/src/php7.4/7.4.33-1+deb11u1/debian/control/ -* https://sources.debian.org/src/php8.1/8.2.5-1/debian/control/ +* https://sources.debian.org/src/php8.1/8.2.10-1/debian/control/ * https://ram.tianon.xyz/post/2017/12/26/dockerize-compiled-software.html diff --git a/dockerfile/php/doctum/Dockerfile b/dockerfile/php/doctum/Dockerfile index 8e0b93ee5..5b57f84c0 100644 --- a/dockerfile/php/doctum/Dockerfile +++ b/dockerfile/php/doctum/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.28 +ARG PHP_VERSION=8.0.30 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/php-cs-fixer/Dockerfile b/dockerfile/php/php-cs-fixer/Dockerfile index 3960cce44..8a72f7389 100644 --- a/dockerfile/php/php-cs-fixer/Dockerfile +++ b/dockerfile/php/php-cs-fixer/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.15 +ARG PHP_VERSION=8.1.23 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/phpmd/Dockerfile b/dockerfile/php/phpmd/Dockerfile index 382f110ed..f88609731 100644 --- a/dockerfile/php/phpmd/Dockerfile +++ b/dockerfile/php/phpmd/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.0.28 +ARG PHP_VERSION=8.0.30 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/sync/docker-image-sync.json b/dockerfile/php/sync/docker-image-sync.json index 34614312f..795568e21 100644 --- a/dockerfile/php/sync/docker-image-sync.json +++ b/dockerfile/php/sync/docker-image-sync.json @@ -1,57 +1,57 @@ [ { - "source": "php:8.2.5-cli-alpine" + "source": "php:8.2.10-cli-alpine" }, { - "source": "php:8.2.5-fpm-alpine" + "source": "php:8.2.10-fpm-alpine" }, { - "source": "php:8.2.5-unit-alpine" + "source": "php:8.2.10-unit-alpine" }, { - "source": "php:8.2.5-composer-alpine" + "source": "php:8.2.10-composer-alpine" }, { - "source": "php:8.2.5-swoole-alpine" + "source": "php:8.2.10-swoole-alpine" }, { - "source": "php:8.2.5-s6-alpine" + "source": "php:8.2.10-s6-alpine" }, { - "source": "php:8.1.15-cli-alpine" + "source": "php:8.1.23-cli-alpine" }, { - "source": "php:8.1.15-fpm-alpine" + "source": "php:8.1.23-fpm-alpine" }, { - "source": "php:8.1.15-unit-alpine" + "source": "php:8.1.23-unit-alpine" }, { - "source": "php:8.1.15-composer-alpine" + "source": "php:8.1.23-composer-alpine" }, { - "source": "php:8.1.15-swoole-alpine" + "source": "php:8.1.23-swoole-alpine" }, { - "source": "php:8.1.15-s6-alpine" + "source": "php:8.1.23-s6-alpine" }, { - "source": "php:8.0.28-cli-alpine" + "source": "php:8.0.30-cli-alpine" }, { - "source": "php:8.0.28-fpm-alpine" + "source": "php:8.0.30-fpm-alpine" }, { - "source": "php:8.0.28-unit-alpine" + "source": "php:8.0.30-unit-alpine" }, { - "source": "php:8.0.28-composer-alpine" + "source": "php:8.0.30-composer-alpine" }, { - "source": "php:8.0.28-swoole-alpine" + "source": "php:8.0.30-swoole-alpine" }, { - "source": "php:8.0.28-s6-alpine" + "source": "php:8.0.30-s6-alpine" }, { "source": "php:nightly-cli-alpine" diff --git a/dockerfile/php/sync/manifest.txt b/dockerfile/php/sync/manifest.txt index ef7e87647..3d477ed62 100644 --- a/dockerfile/php/sync/manifest.txt +++ b/dockerfile/php/sync/manifest.txt @@ -1,21 +1,21 @@ -8.2.5-cli-alpine -8.2.5-fpm-alpine -8.2.5-unit-alpine -8.2.5-composer-alpine -8.2.5-swoole-alpine -8.2.5-s6-alpine -8.1.15-cli-alpine -8.1.15-fpm-alpine -8.1.15-unit-alpine -8.1.15-composer-alpine -8.1.15-swoole-alpine -8.1.15-s6-alpine -8.0.28-cli-alpine -8.0.28-fpm-alpine -8.0.28-unit-alpine -8.0.28-composer-alpine -8.0.28-swoole-alpine -8.0.28-s6-alpine +8.2.10-cli-alpine +8.2.10-fpm-alpine +8.2.10-unit-alpine +8.2.10-composer-alpine +8.2.10-swoole-alpine +8.2.10-s6-alpine +8.1.23-cli-alpine +8.1.23-fpm-alpine +8.1.23-unit-alpine +8.1.23-composer-alpine +8.1.23-swoole-alpine +8.1.23-s6-alpine +8.0.30-cli-alpine +8.0.30-fpm-alpine +8.0.30-unit-alpine +8.0.30-composer-alpine +8.0.30-swoole-alpine +8.0.30-s6-alpine 7.4.33-cli-alpine 7.4.33-fpm-alpine 7.4.33-unit-alpine diff --git a/docs/custom.md b/docs/custom.md index d2f73fe7b..94b04047f 100644 --- a/docs/custom.md +++ b/docs/custom.md @@ -37,7 +37,7 @@ services: php8: # 想修改哪个配置在这里重写即可，例如想使用自己的 PHP 镜像或国内镜像，那么增加 `image` 指令即可 - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.5}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.10}-fpm-alpine ``` 你也可以加上 `build` 字段，先构建镜像再启动 @@ -48,7 +48,7 @@ services: services: php8: - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.5}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.10}-fpm-alpine # 增加 build 字段 build: context: ./dockerfile/php/ diff --git a/kubernetes/lnmp/php/base/lnmp-php.yaml b/kubernetes/lnmp/php/base/lnmp-php.yaml index e82794503..83f15495f 100644 --- a/kubernetes/lnmp/php/base/lnmp-php.yaml +++ b/kubernetes/lnmp/php/base/lnmp-php.yaml @@ -44,7 +44,7 @@ spec: kubernetes.io/os: linux containers: - name: lnmp-php - image: khs1994/php:8.2.5-fpm-alpine + image: khs1994/php:8.2.10-fpm-alpine imagePullPolicy: IfNotPresent args: - php-fpm diff --git a/lrew/nginx-unit/docker-compose.yml b/lrew/nginx-unit/docker-compose.yml index 72b8482a5..e85ea4107 100644 --- a/lrew/nginx-unit/docker-compose.yml +++ b/lrew/nginx-unit/docker-compose.yml @@ -20,7 +20,7 @@ services: << : - *common - *common-label - image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.5}-unit-alpine" + image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.10}-unit-alpine" volumes: - ./config/${LNMP_NGINX_UNIT_CONF:-nginx-unit}:/etc/nginx-unit # ./path/unit-init-conf:/docker-entrypoint.d diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index 904dc3a48..b3d05b59c 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -14,7 +14,7 @@ services: image: memcached:1.6.15-alpine php: - image: php:8.2.5-fpm-alpine + image: php:8.2.10-fpm-alpine composer: image: composer:2.5.8 diff --git a/vscode-remote/docker-workspace.yml b/vscode-remote/docker-workspace.yml index 1300250c9..54ce21e1e 100644 --- a/vscode-remote/docker-workspace.yml +++ b/vscode-remote/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.5-composer-alpine + image: khs1994/php:8.2.10-composer-alpine networks: - backend volumes: @@ -68,7 +68,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.5-composer-alpine" + image: "khs1994/php:8.2.10-composer-alpine" command: [] # install | update npm: diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.json b/windows/lnmp-windows-pm-repo/php/lwpm.json index 5e1d7fdc3..d4c28c28c 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php/lwpm.json @@ -10,7 +10,7 @@ "C:\\php", "C:\\php-pre" ], - "pre-version": "8.2.5", + "pre-version": "8.2.10", "releases": "https://www.php.net/downloads.php", "scripts": { "get-version": "if(!($VERSION)){\n$VERSION=$stable_version\n}\nif($isPre){\n$VC_VERSION=\"nts-Win32-vs16\"\n$VERSION=$pre_version\n$url=\"https://windows.php.net/downloads/qa/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/qa/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php-pre\"\n$global:PHP_PREFIX=\"C:\\php-pre\"\n}else{\n$VC_VERSION=\"nts-Win32-vs16\"\n$url=\"https://windows.php.net/downloads/releases/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/releases/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php\"\n$global:PHP_PREFIX=\"C:\\php\"\n}", @@ -32,5 +32,5 @@ "uninstall": "if($isPre -eq 1){_cleanup \"C:\\php-pre\"}else{_cleanup \"C:\\php\"}\n", "version": "(php -v).split(\" \")[1]" }, - "version": "8.2.5" + "version": "8.2.10" } diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.yaml b/windows/lnmp-windows-pm-repo/php/lwpm.yaml index bbb39f000..d6e4496a2 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php/lwpm.yaml @@ -1,7 +1,7 @@ name: "php" description: "PHP is a popular general-purpose scripting language that is especially suited to web development" -version: "8.2.5" -pre-version: "8.2.5" +version: "8.2.10" +pre-version: "8.2.10" homepage: "https://www.php.net/" bug: "https://www.php.net/" github: "php/php-src" diff --git a/wsl/.env b/wsl/.env index 801b4d1fa..9c7463d5a 100644 --- a/wsl/.env +++ b/wsl/.env @@ -2,8 +2,8 @@ PHP_VERSION_71=7.1.33 PHP_VERSION_72=7.2.34 PHP_VERSION_73=7.3.33 PHP_VERSION_74=7.4.33 -PHP_VERSION_80=8.0.28 -PHP_VERSION_81=8.1.15 -PHP_VERSION_82=8.2.5 +PHP_VERSION_80=8.0.30 +PHP_VERSION_81=8.1.23 +PHP_VERSION_82=8.2.10 registry=docker.io diff --git a/wsl/Dockerfile b/wsl/Dockerfile index 27205f0c1..549cdcdba 100755 --- a/wsl/Dockerfile +++ b/wsl/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim ################################################################################ -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 ARG PHP_NUM=82 diff --git a/wsl/docker-compose.yml b/wsl/docker-compose.yml index a3b5658f9..6b42b5bcd 100755 --- a/wsl/docker-compose.yml +++ b/wsl/docker-compose.yml @@ -22,22 +22,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.28} + - PHP_VERSION=${PHP_VERSION_80:-8.0.30} - 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.28}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-debian-bullseye_amd64 wsl-php-builder-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - 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-php81_${PHP_VERSION_81:-8.1.15}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-debian-bullseye_amd64 wsl-php-builder-nightly: build: @@ -56,11 +56,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - OS_TYPE=debian:bookworm-slim - DEB_URL=mirrors.ustc.edu.cn - DEB_SECURITY_URL=mirrors.ustc.edu.cn/debian-security - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-debian-bookworm_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-debian-bookworm_amd64 # https://endoflife.software/operating-systems/linux/ubuntu # https://github.com/docker-library/docs/tree/master/ubuntu @@ -80,22 +80,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.28} + - PHP_VERSION=${PHP_VERSION_80:-8.0.30} - 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.28}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu1804-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - 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-php81_${PHP_VERSION_81:-8.1.15}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu2004-74: build: @@ -113,22 +113,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.28} + - PHP_VERSION=${PHP_VERSION_80:-8.0.30} - 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.28}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2004-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - 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-php81_${PHP_VERSION_81:-8.1.15}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2204-74: build: @@ -146,22 +146,22 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.28} + - PHP_VERSION=${PHP_VERSION_80:-8.0.30} - 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.28}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-81: build: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - 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-php81_${PHP_VERSION_81:-8.1.15}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-nightly: build: @@ -180,11 +180,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - OS_TYPE=ubuntu:22.10 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-ubuntu-kinetic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-kinetic_amd64 # rhel @@ -210,18 +210,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.28} + - PHP_VERSION=${PHP_VERSION_80:-8.0.30} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.28}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-centos-8_amd64 wsl-php-builder-rhel8-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-centos-8_amd64 wsl-php-builder-rhel9-74: build: @@ -237,18 +237,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.28} + - PHP_VERSION=${PHP_VERSION_80:-8.0.30} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.28}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-centos-9_amd64 wsl-php-builder-rhel9-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-centos-9_amd64 # https://github.com/docker-library/docs/tree/master/rockylinux @@ -257,18 +257,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - OS_TYPE=rockylinux:8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-rocky-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-rocky-8_amd64 wsl-php-builder-rocky9-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - OS_TYPE=rockylinux:9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-rocky-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-rocky-9_amd64 # fedora # https://github.com/docker-library/docs/tree/master/fedora @@ -287,18 +287,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_80:-8.0.28} + - PHP_VERSION=${PHP_VERSION_80:-8.0.30} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.28}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php80_${PHP_VERSION_80:-8.0.30}-fedora-36_amd64 wsl-php-builder-fc36-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.15} + - PHP_VERSION=${PHP_VERSION_81:-8.1.23} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.15}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-fedora-36_amd64 wsl-php-builder-fc36-nightly: build: diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index 002933ed8..869849fbe 100755 --- a/wsl/lnmp-wsl-builder-php +++ b/wsl/lnmp-wsl-builder-php @@ -66,7 +66,7 @@ export TZ=Asia/Shanghai # export CC=clang CXX=clang export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.5 +export PHP_LATEST_VERSION=8.2.10 ################################################################################ for command in "$@" diff --git a/wsl/lnmp-wsl-builder-php-rhel b/wsl/lnmp-wsl-builder-php-rhel index 9435a1e66..de2f80c3e 100755 --- a/wsl/lnmp-wsl-builder-php-rhel +++ b/wsl/lnmp-wsl-builder-php-rhel @@ -56,7 +56,7 @@ export TZ=Asia/Shanghai # export CC=clang CXX=clang # export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.5 +export PHP_LATEST_VERSION=8.2.10 ################################################################################ # diff --git a/wsl/wsl.phpbuilder.Dockerfile b/wsl/wsl.phpbuilder.Dockerfile index 1e4fed647..394efdc2e 100755 --- a/wsl/wsl.phpbuilder.Dockerfile +++ b/wsl/wsl.phpbuilder.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 COPY lnmp-wsl-builder-php /lnmp-wsl-builder-php.sh diff --git a/wsl/wsl.phpbuilder.rhel.Dockerfile b/wsl/wsl.phpbuilder.rhel.Dockerfile index fd75fa3ba..d747e9cfe 100755 --- a/wsl/wsl.phpbuilder.rhel.Dockerfile +++ b/wsl/wsl.phpbuilder.rhel.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.5 +ARG PHP_VERSION=8.2.10 COPY lnmp-wsl-builder-php-rhel /lnmp-wsl-builder-php-rhel.sh From d6f03aabe9d094bdba9e4d7fc0c34d6eeb25cfc1 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 10 Feb 2024 10:43:31 +0800 Subject: [PATCH 28/42] [nginx] Update to v1.25.3 Signed-off-by: Kang Huaishuai --- .env.example | 2 +- CHANGELOG.md | 1 + README.cn.md | 2 +- README.md | 2 +- app/laravel-demo/Dockerfile | 2 +- app/laravel-demo/Dockerfile.buildkit | 2 +- app/laravel-demo/Dockerfile.cdn | 2 +- docker-lnmp.yml | 2 +- docker-production.yml | 4 ++-- dockerfile/nginx/.env.example | 2 +- dockerfile/nginx/README.md | 4 ++-- dockerfile/nginx/alpine/Dockerfile | 2 +- dockerfile/nginx/buster/Dockerfile | 2 +- dockerfile/nginx/docker-compose.yml | 10 +++++----- dockerfile/sync/docker-image-sync.json | 8 ++++---- drone/.env.example | 2 +- drone/docker-ci.yml | 4 ++-- kubernetes/.env.example | 2 +- kubernetes/.github/workflows/setup-k8s.yaml | 2 +- kubernetes/coreos/ignition/bu/kube-nginx.bu | 4 ++-- kubernetes/coreos/server/Dockerfile | 2 +- kubernetes/kube-nginx/Dockerfile | 2 +- kubernetes/kube-nginx/docker-compose.yml | 2 +- kubernetes/lnmp/nginx/base/lnmp-nginx.yaml | 4 ++-- scripts/docker-compose.bump.yml | 2 +- windows/lnmp-windows-pm-repo/nginx/lwpm.json | 2 +- windows/lnmp-windows-pm-repo/nginx/lwpm.yaml | 2 +- 27 files changed, 39 insertions(+), 38 deletions(-) diff --git a/.env.example b/.env.example index 614b2906b..7fe0248a9 100644 --- a/.env.example +++ b/.env.example @@ -119,7 +119,7 @@ TZ=Asia/Shanghai # [Version] # https://nginx.org/en/CHANGES -LNMP_NGINX_VERSION=1.25.1 +LNMP_NGINX_VERSION=1.25.3 LNMP_MYSQL_VERSION=8.0.33 diff --git a/CHANGELOG.md b/CHANGELOG.md index 605c5165c..740b61b43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,3 +13,4 @@ ### Updates: * [PHP `8.2.10` `8.1.23` `8.0.29`](https://www.php.net/ChangeLog-8.php#8.1.23) +* [nginx `1.25.3`](https://nginx.org/en/CHANGES) diff --git a/README.cn.md b/README.cn.md index c402f1fd3..1f8d34a9a 100644 --- a/README.cn.md +++ b/README.cn.md @@ -210,7 +210,7 @@ $ ./lnmp-docker down |Name|Docker Image|Version|Based| |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | -|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.1-alpine` | **1.25.1** |`alpine:3.13` | +|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.3-alpine` | **1.25.3** |`alpine:3.13` | |[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.10-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| diff --git a/README.md b/README.md index a3d7e5dc7..ba2d6e63a 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |Name|Docker Image|Version|Based| |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | -|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.1-alpine` | **1.25.1** |`alpine:3.13` | +|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.3-alpine` | **1.25.3** |`alpine:3.13` | |[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.10-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index f16d54044..d52969273 100644 --- a/app/laravel-demo/Dockerfile +++ b/app/laravel-demo/Dockerfile @@ -15,7 +15,7 @@ ARG NODE_VERSION=20.5.1 ARG PHP_VERSION=8.2.10 -ARG NGINX_VERSION=1.25.1-alpine +ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 diff --git a/app/laravel-demo/Dockerfile.buildkit b/app/laravel-demo/Dockerfile.buildkit index 812b4b125..79fba601f 100644 --- a/app/laravel-demo/Dockerfile.buildkit +++ b/app/laravel-demo/Dockerfile.buildkit @@ -17,7 +17,7 @@ ARG NODE_VERSION=20.5.1 ARG PHP_VERSION=8.2.10 -ARG NGINX_VERSION=1.25.1-alpine +ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 diff --git a/app/laravel-demo/Dockerfile.cdn b/app/laravel-demo/Dockerfile.cdn index 6a6cfc91b..a4274f185 100644 --- a/app/laravel-demo/Dockerfile.cdn +++ b/app/laravel-demo/Dockerfile.cdn @@ -16,7 +16,7 @@ # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.cdn --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG PHP_VERSION=8.2.10 -ARG NGINX_VERSION=1.25.1-alpine +ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 diff --git a/docker-lnmp.yml b/docker-lnmp.yml index bd8ae6100..ec7038485 100644 --- a/docker-lnmp.yml +++ b/docker-lnmp.yml @@ -265,7 +265,7 @@ services: nginx: << : [*common,*common-labels] - image: "${LNMP_LIBRARY_NS:-library}/nginx:${LNMP_NGINX_VERSION:-1.25.1}-alpine" + image: "${LNMP_LIBRARY_NS:-library}/nginx:${LNMP_NGINX_VERSION:-1.25.3}-alpine" ports: - "${LNMP_NGINX_HTTPS_PORT:-0.0.0.0:443}:443/udp" - "${LNMP_NGINX_HTTPS_PORT:-0.0.0.0:443}:443/tcp" diff --git a/docker-production.yml b/docker-production.yml index 1c0e51fde..a95a23634 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -419,8 +419,8 @@ services: # context: ./dockerfile/nginx/ context: ./config/nginx dockerfile: Dockerfile - image: nginx:1.25.1-alpine - # image: khs1994/nginx:1.25.1-alpine + image: nginx:1.25.3-alpine + # image: khs1994/nginx:1.25.3-alpine ports: - "443:443/tcp" - "443:443/udp" diff --git a/dockerfile/nginx/.env.example b/dockerfile/nginx/.env.example index 6828ea539..04542cd4b 100644 --- a/dockerfile/nginx/.env.example +++ b/dockerfile/nginx/.env.example @@ -1 +1 @@ -NGINX_VERSION=1.25.1 +NGINX_VERSION=1.25.3 diff --git a/dockerfile/nginx/README.md b/dockerfile/nginx/README.md index 780864c82..c45e21582 100644 --- a/dockerfile/nginx/README.md +++ b/dockerfile/nginx/README.md @@ -36,7 +36,7 @@ version: "3" services: nginx: - image: "khs1994/nginx:1.25.1-alpine" + image: "khs1994/nginx:1.25.3-alpine" ports: - "80:80" - "443:443/tcp" @@ -57,7 +57,7 @@ $ docker run -dit \ -p 443:443/udp \ -v $PWD/app:/app \ -v $PWD/conf.d:/etc/nginx/conf.d \ - khs1994/nginx:1.25.1-alpine + khs1994/nginx:1.25.3-alpine ``` # Who use it? diff --git a/dockerfile/nginx/alpine/Dockerfile b/dockerfile/nginx/alpine/Dockerfile index d7c136455..c3abfbe44 100644 --- a/dockerfile/nginx/alpine/Dockerfile +++ b/dockerfile/nginx/alpine/Dockerfile @@ -34,7 +34,7 @@ FROM alpine:3.16 LABEL maintainer="khs1994.com nginx With HTTP3" -ARG NGINX_VERSION=1.25.1 +ARG NGINX_VERSION=1.25.3 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/nginx/buster/Dockerfile b/dockerfile/nginx/buster/Dockerfile index 048a4ec8e..6e9a9033d 100644 --- a/dockerfile/nginx/buster/Dockerfile +++ b/dockerfile/nginx/buster/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster-slim -ARG NGINX_VERSION=1.25.1 +ARG NGINX_VERSION=1.25.3 ARG DEB_URL=deb.debian.org diff --git a/dockerfile/nginx/docker-compose.yml b/dockerfile/nginx/docker-compose.yml index 7752bacd3..c6973b766 100644 --- a/dockerfile/nginx/docker-compose.yml +++ b/dockerfile/nginx/docker-compose.yml @@ -6,10 +6,10 @@ services: context: ./alpine args: # OPENSSL_BRANCH: master - NGINX_VERSION: ${NGINX_VERSION:-1.25.1} + NGINX_VERSION: ${NGINX_VERSION:-1.25.3} ALPINE_URL: mirrors.aliyun.com # dl-cdn.alpinelinux.org OPENSSL_URL: https://github.com.cnpmjs.org/google/boringssl - image: khs1994/nginx:${NGINX_VERSION:-1.25.1}-alpine + image: khs1994/nginx:${NGINX_VERSION:-1.25.3}-alpine ports: - 443:443/tcp - 443:443/udp @@ -23,11 +23,11 @@ services: context: ./buster args: # OPENSSL_BRANCH: master - NGINX_VERSION: ${NGINX_VERSION:-1.25.1} + NGINX_VERSION: ${NGINX_VERSION:-1.25.3} OPENSSL_URL: https://github.com.cnpmjs.org/google/boringssl DEB_URL: mirrors.ustc.edu.cn # deb.debian.org DEB_SECURITY_URL: mirrors.ustc.edu.cn/debian-security # security.debian.org/debian-security - image: khs1994/nginx:${NGINX_VERSION:-1.25.1}-buster + image: khs1994/nginx:${NGINX_VERSION:-1.25.3}-buster ports: - 443:443/tcp - 443:443/udp @@ -36,7 +36,7 @@ services: - ./conf.d:/etc/nginx/conf.d:ro official: - image: nginx:1.25.1-alpine + image: nginx:1.25.3-alpine ports: - 443:443 - 80:80 diff --git a/dockerfile/sync/docker-image-sync.json b/dockerfile/sync/docker-image-sync.json index 87a6db67e..233ae788d 100644 --- a/dockerfile/sync/docker-image-sync.json +++ b/dockerfile/sync/docker-image-sync.json @@ -168,8 +168,8 @@ "dest": "library-mirror/nginx:1.24.0-alpine" }, { - "source": "library/nginx:1.25.1-alpine", - "dest": "library-mirror/nginx:1.25.1-alpine" + "source": "library/nginx:1.25.3-alpine", + "dest": "library-mirror/nginx:1.25.3-alpine" }, { "source": "library/httpd:alpine", @@ -246,7 +246,7 @@ "source": "khs1994/tls" }, { - "source": "khs1994/kube-nginx:1.25.1" + "source": "khs1994/kube-nginx:1.25.3" }, { "source": "khs1994/kube-nginx" @@ -261,7 +261,7 @@ "source": "khs1994/nginx:alpine" }, { - "source": "khs1994/nginx:1.25.1-alpine" + "source": "khs1994/nginx:1.25.3-alpine" }, { "source": "khs1994/docker-image-sync:latest" diff --git a/drone/.env.example b/drone/.env.example index 98b37748c..c8d04d826 100644 --- a/drone/.env.example +++ b/drone/.env.example @@ -147,7 +147,7 @@ DRONE_UI_PASSWORD=root CI_DB_TYPE= CI_DRONE_VERSION=2.16.0 -CI_NGINX_VERSION=1.25.1 +CI_NGINX_VERSION=1.25.3 CI_REDIS_VERSION=7.0.0 CI_MYSQL_VERSION=8.0.33 diff --git a/drone/docker-ci.yml b/drone/docker-ci.yml index e20d3891d..e0a86e223 100644 --- a/drone/docker-ci.yml +++ b/drone/docker-ci.yml @@ -89,8 +89,8 @@ services: nginx: << : *common - # image: khs1994/nginx:${CI_NGINX_VERSION:-1.25.1}-alpine - image: nginx:${CI_NGINX_VERSION:-1.25.1}-alpine + # image: khs1994/nginx:${CI_NGINX_VERSION:-1.25.3}-alpine + image: nginx:${CI_NGINX_VERSION:-1.25.3}-alpine networks: - frontend ports: diff --git a/kubernetes/.env.example b/kubernetes/.env.example index f1cae0134..bca24450e 100644 --- a/kubernetes/.env.example +++ b/kubernetes/.env.example @@ -19,7 +19,7 @@ HELM_VERSION=3.11.3 CNI_VERSION=1.2.0 # https://github.com/kubernetes-sigs/cri-tools/releases CRICTL_VERSION=1.27.0 -NGINX_VERSION=1.25.1 +NGINX_VERSION=1.25.3 # https://github.com/containerd/containerd/releases CONTAINERD_VERSION=1.7.0 # https://github.com/containers/conmon/releases diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index 249a5096f..b29c87a4d 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -98,7 +98,7 @@ jobs: LNMP_K8S_GET: --url # - os: ubuntu # dist: 20.04 - # CI_KUBERNETES_VERSION: 1.25.12 + # CI_KUBERNETES_VERSION: 1.25.32 # LNMP_K8S_GET: --url fail-fast: false steps: diff --git a/kubernetes/coreos/ignition/bu/kube-nginx.bu b/kubernetes/coreos/ignition/bu/kube-nginx.bu index acb24195c..89253e684 100644 --- a/kubernetes/coreos/ignition/bu/kube-nginx.bu +++ b/kubernetes/coreos/ignition/bu/kube-nginx.bu @@ -18,8 +18,8 @@ systemd: # ExecStart=${K8S_ROOT}/kube-nginx/sbin/nginx -c ${K8S_ROOT}/kube-nginx/conf/kube-nginx.conf -p ${K8S_ROOT}/kube-nginx # ExecReload=${K8S_ROOT}/kube-nginx/sbin/nginx -c ${K8S_ROOT}/kube-nginx/conf/kube-nginx.conf -p ${K8S_ROOT}/kube-nginx -s reload ExecStartPre=-/bin/podman container rm kube-nginx - ExecStartPre=/bin/podman container run --rm $OPTIONS khs1994/kube-nginx:1.25.1 -t - ExecStart=/bin/podman container run --name kube-nginx $OPTIONS khs1994/kube-nginx:1.25.1 + ExecStartPre=/bin/podman container run --rm $OPTIONS khs1994/kube-nginx:1.25.3 -t + ExecStart=/bin/podman container run --name kube-nginx $OPTIONS khs1994/kube-nginx:1.25.3 ExecStop=/bin/podman container stop kube-nginx ExecStopPost=/bin/podman container rm kube-nginx PrivateTmp=true diff --git a/kubernetes/coreos/server/Dockerfile b/kubernetes/coreos/server/Dockerfile index 6b81edcfc..2edb3c580 100644 --- a/kubernetes/coreos/server/Dockerfile +++ b/kubernetes/coreos/server/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.25.1-alpine +FROM nginx:1.25.3-alpine LABEL maintainer="khs1994@khs1994.com" diff --git a/kubernetes/kube-nginx/Dockerfile b/kubernetes/kube-nginx/Dockerfile index 5aeaa1052..30940cd67 100644 --- a/kubernetes/kube-nginx/Dockerfile +++ b/kubernetes/kube-nginx/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NGINX_VERSION=1.25.1 +ENV NGINX_VERSION=1.25.3 RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \ && apk add --no-cache --virtual .build_deps \ diff --git a/kubernetes/kube-nginx/docker-compose.yml b/kubernetes/kube-nginx/docker-compose.yml index 86c52482b..d9ec02af1 100644 --- a/kubernetes/kube-nginx/docker-compose.yml +++ b/kubernetes/kube-nginx/docker-compose.yml @@ -2,6 +2,6 @@ services: kube-nginx: - image: khs1994/kube-nginx:1.25.1 + image: khs1994/kube-nginx:1.25.3 build: context: ./ diff --git a/kubernetes/lnmp/nginx/base/lnmp-nginx.yaml b/kubernetes/lnmp/nginx/base/lnmp-nginx.yaml index 9841cb5f3..d60bf459f 100644 --- a/kubernetes/lnmp/nginx/base/lnmp-nginx.yaml +++ b/kubernetes/lnmp/nginx/base/lnmp-nginx.yaml @@ -33,8 +33,8 @@ spec: terminationGracePeriodSeconds: 60 containers: - name: lnmp-nginx - # image: khs1994/nginx:1.25.1-alpine - image: "nginx:1.25.1-alpine" + # image: khs1994/nginx:1.25.3-alpine + image: "nginx:1.25.3-alpine" # image: ranadeeppolavarapu/nginx-http3 imagePullPolicy: IfNotPresent args: diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index b3d05b59c..cc327dbd5 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -20,7 +20,7 @@ services: image: composer:2.5.8 nginx: - image: nginx:1.25.1-alpine + image: nginx:1.25.3-alpine nginx-unit: image: docker.io/nginx/unit:1.30.0-minimal diff --git a/windows/lnmp-windows-pm-repo/nginx/lwpm.json b/windows/lnmp-windows-pm-repo/nginx/lwpm.json index 39d6248ba..6b93c2b64 100644 --- a/windows/lnmp-windows-pm-repo/nginx/lwpm.json +++ b/windows/lnmp-windows-pm-repo/nginx/lwpm.json @@ -8,7 +8,7 @@ "path": [ "C:\\nginx" ], - "pre-version": "1.25.1", + "pre-version": "1.25.3", "releases": "https://nginx.org/en/download.html", "scripts": { "install": "_cleanup nginx\n_unzip $filename nginx\n\n_mkdir C:\\nginx\n\nif(Test-Path C:\\nginx\\conf\\nginx.conf){\nCopy-Item C:\\nginx\\conf\\nginx.conf ~/Downloads/lnmp-docker-cache/nginx.conf.backup\n}\n\nCopy-item -r -force \"nginx\\nginx-${VERSION}\\*\" \"C:\\nginx\"\n\n_cleanup nginx\n\ncp $home/lnmp/windows/config/nginx.conf C:/nginx/conf\n", diff --git a/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml b/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml index 9461ff5e3..a8c0d7979 100644 --- a/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/nginx/lwpm.yaml @@ -1,7 +1,7 @@ name: "nginx" description: "small, powerful, scalable web/proxy server" version: "1.24.0" -pre-version: "1.25.1" +pre-version: "1.25.3" homepage: "https://nginx.org" bug: "http://nginx.org/en/support.html" github: "nginx/nginx" From 778873568411a9c2219ce310f6465dc7b94667d1 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 10 Feb 2024 10:57:59 +0800 Subject: [PATCH 29/42] [php] Test v8.3.0 Signed-off-by: Kang Huaishuai --- .env.example | 2 +- dockerfile/php/.env.example | 2 +- dockerfile/php/.github/workflows/php_8_3.yml | 4 ++-- dockerfile/php/8.3/cli/Dockerfile | 4 ++-- dockerfile/php/8.3/composer/Dockerfile | 2 +- dockerfile/php/8.3/fpm/Dockerfile | 2 +- dockerfile/php/8.3/s6/Dockerfile | 2 +- dockerfile/php/8.3/swoole/Dockerfile | 4 ++-- dockerfile/php/8.3/unit/Dockerfile | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.env.example b/.env.example index 7fe0248a9..a73e92c1b 100644 --- a/.env.example +++ b/.env.example @@ -141,7 +141,7 @@ LNMP_PHP8_VERSION=8.2.10 LNMP_PHP80_VERSION=8.0.30 LNMP_PHP81_VERSION=8.1.23 LNMP_PHP82_VERSION=8.2.10 -LNMP_PHP83_VERSION=8.3.0beta1 +LNMP_PHP83_VERSION=8.3.0 LNMP_REDIS_VERSION=7.0.0 diff --git a/dockerfile/php/.env.example b/dockerfile/php/.env.example index ab8258fec..452e76353 100644 --- a/dockerfile/php/.env.example +++ b/dockerfile/php/.env.example @@ -1,6 +1,6 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION_83=8.3.0beta1 +PHP_VERSION_83=8.3.0 PHP_VERSION_82=8.2.10 PHP_VERSION_81=8.1.23 PHP_VERSION_80=8.0.30 diff --git a/dockerfile/php/.github/workflows/php_8_3.yml b/dockerfile/php/.github/workflows/php_8_3.yml index 0b5bbeeb7..f17179076 100644 --- a/dockerfile/php/.github/workflows/php_8_3.yml +++ b/dockerfile/php/.github/workflows/php_8_3.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.3.0beta1" + default: "8.3.0" name: PHP_8.3 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_3_X FOLDER: "8.3" - PHP_TAG_VERSION: "8.3.0beta1" + PHP_TAG_VERSION: "8.3.0" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/8.3/cli/Dockerfile b/dockerfile/php/8.3/cli/Dockerfile index bd49cefe3..58bf73a54 100644 --- a/dockerfile/php/8.3/cli/Dockerfile +++ b/dockerfile/php/8.3/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.3.0beta1 +ARG PHP_VERSION=8.3.0 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream @@ -10,7 +10,7 @@ LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.3.0beta1 +ARG PHP_VERSION=8.3.0 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.3/composer/Dockerfile b/dockerfile/php/8.3/composer/Dockerfile index 6330fdd5d..a169ea754 100644 --- a/dockerfile/php/8.3/composer/Dockerfile +++ b/dockerfile/php/8.3/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.3.0beta1 +ARG PHP_VERSION=8.3.0 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.3/fpm/Dockerfile b/dockerfile/php/8.3/fpm/Dockerfile index 6322a8f8d..2ecb1a24f 100644 --- a/dockerfile/php/8.3/fpm/Dockerfile +++ b/dockerfile/php/8.3/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.3.0beta1 +ARG PHP_VERSION=8.3.0 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.18 as php diff --git a/dockerfile/php/8.3/s6/Dockerfile b/dockerfile/php/8.3/s6/Dockerfile index abec2f60d..938fee5df 100644 --- a/dockerfile/php/8.3/s6/Dockerfile +++ b/dockerfile/php/8.3/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.3.0beta1 +ARG PHP_VERSION=8.3.0 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.3/swoole/Dockerfile b/dockerfile/php/8.3/swoole/Dockerfile index 2877767e9..3358315fc 100644 --- a/dockerfile/php/8.3/swoole/Dockerfile +++ b/dockerfile/php/8.3/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.3.0beta1 +ARG PHP_VERSION=8.3.0 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=master ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.3.0beta1-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.3.0-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.3/unit/Dockerfile b/dockerfile/php/8.3/unit/Dockerfile index 599faaf1d..df24cea6f 100644 --- a/dockerfile/php/8.3/unit/Dockerfile +++ b/dockerfile/php/8.3/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.3.0beta1 +ARG PHP_VERSION=8.3.0 ARG USERNAME=khs1994 ARG BASE=cli From ae9b1818918f946720ac47ec268cd425c1ac6e7b Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 10 Feb 2024 11:36:18 +0800 Subject: [PATCH 30/42] [php] 8.4 removed ext pspell and imap Signed-off-by: Kang Huaishuai --- CHANGELOG.md | 2 +- dockerfile/php/7.4/cli/Dockerfile | 2 +- dockerfile/php/8.0/cli/Dockerfile | 2 +- dockerfile/php/8.1/cli/Dockerfile | 2 +- dockerfile/php/8.2/cli/Dockerfile | 2 +- dockerfile/php/8.3/cli/Dockerfile | 2 +- dockerfile/php/CHANGELOG.md | 12 ++++++++++++ dockerfile/php/nightly/cli/Dockerfile | 14 +++++++------- dockerfile/php/nightly/fpm/Dockerfile | 14 +++++++------- wsl/lnmp-wsl-builder-php | 2 +- wsl/lnmp-wsl-builder-php-rhel | 2 +- 11 files changed, 34 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 740b61b43..8fc8af079 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,5 +12,5 @@ ### Updates: -* [PHP `8.2.10` `8.1.23` `8.0.29`](https://www.php.net/ChangeLog-8.php#8.1.23) +* [PHP `8.2.10` `8.1.23` `8.0.30`](https://www.php.net/ChangeLog-8.php#8.1.23) * [nginx `1.25.3`](https://nginx.org/en/CHANGES) diff --git a/dockerfile/php/7.4/cli/Dockerfile b/dockerfile/php/7.4/cli/Dockerfile index fbbd65829..4729f5f28 100644 --- a/dockerfile/php/7.4/cli/Dockerfile +++ b/dockerfile/php/7.4/cli/Dockerfile @@ -103,9 +103,9 @@ ENV PHP_EXTRA_CONFIGURE_ARGS \ --with-bz2=shared \ --with-tidy=no \ --with-gmp=shared \ - --with-kerberos \ --with-imap=shared \ --with-imap-ssl \ + --with-kerberos \ --with-xmlrpc=no \ --with-pic \ --with-enchant=shared \ diff --git a/dockerfile/php/8.0/cli/Dockerfile b/dockerfile/php/8.0/cli/Dockerfile index 15b624848..a76449f4a 100644 --- a/dockerfile/php/8.0/cli/Dockerfile +++ b/dockerfile/php/8.0/cli/Dockerfile @@ -96,9 +96,9 @@ ENV PHP_EXTRA_CONFIGURE_ARGS \ --with-bz2=shared \ # --with-tidy=shared \ --with-gmp=shared \ - --with-kerberos \ --with-imap=shared \ --with-imap-ssl \ + --with-kerberos \ # --with-xmlrpc=shared 8.0 removed --with-pic \ --with-enchant=shared \ diff --git a/dockerfile/php/8.1/cli/Dockerfile b/dockerfile/php/8.1/cli/Dockerfile index bff8ff076..08b6a3dbc 100644 --- a/dockerfile/php/8.1/cli/Dockerfile +++ b/dockerfile/php/8.1/cli/Dockerfile @@ -97,9 +97,9 @@ ENV PHP_EXTRA_CONFIGURE_ARGS \ --with-bz2=shared \ # --with-tidy=shared \ --with-gmp=shared \ - --with-kerberos \ --with-imap=shared \ --with-imap-ssl \ + --with-kerberos \ --with-pic \ --with-enchant=shared \ --enable-fileinfo=shared \ diff --git a/dockerfile/php/8.2/cli/Dockerfile b/dockerfile/php/8.2/cli/Dockerfile index add80fd75..419f6a0d7 100644 --- a/dockerfile/php/8.2/cli/Dockerfile +++ b/dockerfile/php/8.2/cli/Dockerfile @@ -100,9 +100,9 @@ ENV PHP_EXTRA_CONFIGURE_ARGS \ --with-bz2=shared \ # --with-tidy=shared \ --with-gmp=shared \ - --with-kerberos \ --with-imap=shared \ --with-imap-ssl \ + --with-kerberos \ --with-enchant=shared \ --enable-fileinfo=shared \ --with-ldap=shared \ diff --git a/dockerfile/php/8.3/cli/Dockerfile b/dockerfile/php/8.3/cli/Dockerfile index 58bf73a54..41136fa96 100644 --- a/dockerfile/php/8.3/cli/Dockerfile +++ b/dockerfile/php/8.3/cli/Dockerfile @@ -100,9 +100,9 @@ ENV PHP_EXTRA_CONFIGURE_ARGS \ --with-bz2=shared \ # --with-tidy=shared \ --with-gmp=shared \ - --with-kerberos \ --with-imap=shared \ --with-imap-ssl \ + --with-kerberos \ --with-enchant=shared \ --enable-fileinfo=shared \ --with-ldap=shared \ diff --git a/dockerfile/php/CHANGELOG.md b/dockerfile/php/CHANGELOG.md index e88ff0dc0..08cf06fcf 100644 --- a/dockerfile/php/CHANGELOG.md +++ b/dockerfile/php/CHANGELOG.md @@ -4,3 +4,15 @@ * Resupport `5.6` `7.0` * Add `nightly-TYPE-alpine`, build from php-src git * Support buildkit + +## 8.4 + +## Remove ext/imap — it has been moved to PECL + +* https://hub.nuaa.cf/php/php-src/commit/f62f6a6d4b9567530775d684db55e9990952c737 +* https://hub.nuaa.cf/php/php-src/commits/master/ext/imap + +### PSpell has been moved to PECL + +* https://hub.nuaa.cf/php/php-src/commit/b035cb6c8e31bea351f169b3e9f34fdc562e77e1 +* https://hub.nuaa.cf/php/php-src/commits/master/ext/pspell diff --git a/dockerfile/php/nightly/cli/Dockerfile b/dockerfile/php/nightly/cli/Dockerfile index 566df40eb..72eafce0b 100644 --- a/dockerfile/php/nightly/cli/Dockerfile +++ b/dockerfile/php/nightly/cli/Dockerfile @@ -98,15 +98,15 @@ ENV PHP_EXTRA_CONFIGURE_ARGS \ --with-bz2=shared \ # --with-tidy=shared \ --with-gmp=shared \ - --with-kerberos \ - --with-imap=shared \ - --with-imap-ssl \ + # --with-imap=shared \ # 8.4 removed # https://hub.nuaa.cf/php/php-src/commit/f62f6a6d4b9567530775d684db55e9990952c737 + # --with-imap-ssl \ + # --with-kerberos \ --with-pic \ --with-enchant=shared \ --enable-fileinfo=shared \ --with-ldap=shared \ --with-ldap-sasl \ - --with-pspell=shared \ + # --with-pspell=shared \ # 8.4 removed # https://hub.nuaa.cf/php/php-src/commit/b035cb6c8e31bea351f169b3e9f34fdc562e77e1 --enable-shmop=shared \ # --with-snmp=shared \ --with-mysqli=shared \ @@ -220,7 +220,7 @@ RUN --mount=type=bind,from=php:alpine,source=/usr/local/bin,target=/opt/bin,rw \ gmp-dev \ bzip2-dev \ enchant2-dev \ - imap-dev \ + # imap-dev \ # 8.4 removed # https://hub.nuaa.cf/php/php-src/commit/f62f6a6d4b9567530775d684db55e9990952c737 gettext-dev \ icu-dev \ krb5-dev \ @@ -297,7 +297,7 @@ RUN --mount=type=bind,from=php:alpine,source=/usr/local/bin,target=/opt/bin,rw \ # gd \ gettext \ gmp \ - imap \ + # imap \ # 8.4 removed # https://hub.nuaa.cf/php/php-src/commit/f62f6a6d4b9567530775d684db55e9990952c737 intl \ ldap \ pcntl \ @@ -308,7 +308,7 @@ RUN --mount=type=bind,from=php:alpine,source=/usr/local/bin,target=/opt/bin,rw \ pdo_mysql \ pdo_pgsql \ pgsql \ - pspell \ + # pspell \ # 8.4 removed # https://hub.nuaa.cf/php/php-src/commit/b035cb6c8e31bea351f169b3e9f34fdc562e77e1 shmop \ # snmp \ # soap \ diff --git a/dockerfile/php/nightly/fpm/Dockerfile b/dockerfile/php/nightly/fpm/Dockerfile index 06b0a0450..266c12b85 100644 --- a/dockerfile/php/nightly/fpm/Dockerfile +++ b/dockerfile/php/nightly/fpm/Dockerfile @@ -96,15 +96,15 @@ ENV PHP_EXTRA_CONFIGURE_ARGS \ --with-bz2=shared \ # --with-tidy=shared \ --with-gmp=shared \ - --with-kerberos \ - --with-imap=shared \ - --with-imap-ssl \ + # --with-imap=shared \ # 8.4 removed # https://hub.nuaa.cf/php/php-src/commit/f62f6a6d4b9567530775d684db55e9990952c737 + # --with-imap-ssl \ + # --with-kerberos \ --with-pic \ --with-enchant=shared \ --enable-fileinfo=shared \ --with-ldap=shared \ --with-ldap-sasl \ - --with-pspell=shared \ + # --with-pspell=shared \ # 8.4 removed # https://hub.nuaa.cf/php/php-src/commit/b035cb6c8e31bea351f169b3e9f34fdc562e77e1 --enable-shmop=shared \ # --with-snmp=shared \ --with-mysqli=shared \ @@ -204,7 +204,7 @@ RUN --mount=type=bind,from=php:fpm-alpine,source=/usr/local/bin,target=/opt/bin, gmp-dev \ bzip2-dev \ enchant2-dev \ - imap-dev \ + # imap-dev \ # 8.4 removed # https://hub.nuaa.cf/php/php-src/commit/f62f6a6d4b9567530775d684db55e9990952c737 gettext-dev \ icu-dev \ krb5-dev \ @@ -282,7 +282,7 @@ RUN --mount=type=bind,from=php:fpm-alpine,source=/usr/local/bin,target=/opt/bin, # gd \ gettext \ gmp \ - imap \ + # imap \ # 8.4 removed # https://hub.nuaa.cf/php/php-src/commit/f62f6a6d4b9567530775d684db55e9990952c737 intl \ pcntl \ openssl \ @@ -293,7 +293,7 @@ RUN --mount=type=bind,from=php:fpm-alpine,source=/usr/local/bin,target=/opt/bin, pdo_mysql \ pdo_pgsql \ pgsql \ - pspell \ + # pspell \ # 8.4 removed # https://hub.nuaa.cf/php/php-src/commit/b035cb6c8e31bea351f169b3e9f34fdc562e77e1 shmop \ # snmp \ # soap \ diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index 869849fbe..cb3a38def 100755 --- a/wsl/lnmp-wsl-builder-php +++ b/wsl/lnmp-wsl-builder-php @@ -476,7 +476,6 @@ set +e \ --with-curl \ --with-gettext \ - --with-kerberos \ --with-libedit \ --with-openssl \ --with-system-ciphers \ @@ -537,6 +536,7 @@ set +e --with-gmp \ --with-imap=shared \ --with-imap-ssl \ + --with-kerberos \ \ --with-pic \ --with-enchant=shared \ diff --git a/wsl/lnmp-wsl-builder-php-rhel b/wsl/lnmp-wsl-builder-php-rhel index de2f80c3e..a83b19a16 100755 --- a/wsl/lnmp-wsl-builder-php-rhel +++ b/wsl/lnmp-wsl-builder-php-rhel @@ -478,7 +478,6 @@ _builder(){ \ --with-curl \ --with-gettext \ - --with-kerberos \ --with-libedit \ --with-openssl \ --with-system-ciphers \ @@ -537,6 +536,7 @@ _builder(){ --with-gmp \ --with-imap=shared \ --with-imap-ssl \ + --with-kerberos \ \ --with-pic \ --with-enchant=shared \ From cf23d4312fccc1e76d96a600362220c58039e9f9 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 10 Feb 2024 12:02:18 +0800 Subject: [PATCH 31/42] [php] Update Dockerfile Signed-off-by: Kang Huaishuai --- dockerfile/php/8.0/cli/Dockerfile | 1 + dockerfile/php/8.1/cli/Dockerfile | 1 + dockerfile/php/8.2/cli/Dockerfile | 1 + dockerfile/php/8.3/cli/Dockerfile | 1 + dockerfile/php/nightly/cli/Dockerfile | 1 + dockerfile/php/nightly/fpm/Dockerfile | 1 + 6 files changed, 6 insertions(+) diff --git a/dockerfile/php/8.0/cli/Dockerfile b/dockerfile/php/8.0/cli/Dockerfile index a76449f4a..098a95d3b 100644 --- a/dockerfile/php/8.0/cli/Dockerfile +++ b/dockerfile/php/8.0/cli/Dockerfile @@ -205,6 +205,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \ && export CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ + PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ && docker-php-source extract \ && cd /usr/src/php \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ diff --git a/dockerfile/php/8.1/cli/Dockerfile b/dockerfile/php/8.1/cli/Dockerfile index 08b6a3dbc..12e946c9c 100644 --- a/dockerfile/php/8.1/cli/Dockerfile +++ b/dockerfile/php/8.1/cli/Dockerfile @@ -205,6 +205,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \ && export CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ + PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ && 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 419f6a0d7..14eaaed4f 100644 --- a/dockerfile/php/8.2/cli/Dockerfile +++ b/dockerfile/php/8.2/cli/Dockerfile @@ -204,6 +204,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \ && export CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ + PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ && 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 41136fa96..2539f1995 100644 --- a/dockerfile/php/8.3/cli/Dockerfile +++ b/dockerfile/php/8.3/cli/Dockerfile @@ -204,6 +204,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \ && export CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ + PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ && docker-php-source extract \ && cd /usr/src/php \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ diff --git a/dockerfile/php/nightly/cli/Dockerfile b/dockerfile/php/nightly/cli/Dockerfile index 72eafce0b..2621a1551 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 \ && export CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ + PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ 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 266c12b85..068a1b7c3 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, && export CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ + PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \ ARGON2_LIBS="-largon2" \ ARGON2_CFLAGS="-I/usr/include" \ # && docker-php-source extract \ From add8e63956a6dcb46e610a48e02853cc02c5ec57 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 10 Feb 2024 13:00:02 +0800 Subject: [PATCH 32/42] [Kubernetes] Test v1.29.0 [sync git] Signed-off-by: Kang Huaishuai --- CHANGELOG.md | 1 + kubernetes/.env.example | 2 +- kubernetes/.github/workflows/setup-k8s.yaml | 28 +++++++++---------- kubernetes/bin/lwpm.ps1 | 4 +-- kubernetes/cfssl/Dockerfile | 2 +- kubernetes/docker-compose.bump.yml | 4 +-- kubernetes/kubernetes-release/Dockerfile | 2 +- .../kubernetes-release/Dockerfile.buildx | 2 +- .../kubernetes-release/release/stable.txt | 2 +- kubernetes/rpi/README.md | 2 +- kubernetes/wsl2/00-README.NODE.md | 4 +-- kubernetes/wsl2/00-README.SERVER.md | 4 +-- scripts/docker-compose.bump.yml | 2 -- .../lnmp-windows-pm-repo/k8s/crictl/lwpm.json | 7 ++--- .../lnmp-windows-pm-repo/k8s/crictl/lwpm.yml | 6 ++-- .../k8s/kubectl/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml | 2 +- .../k8s/kubernetes-node/lwpm.json | 2 +- .../k8s/kubernetes-node/lwpm.yml | 2 +- .../k8s/kubernetes-server/lwpm.json | 2 +- .../k8s/kubernetes-server/lwpm.yml | 2 +- 21 files changed, 39 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fc8af079..a9e890b8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,3 +14,4 @@ * [PHP `8.2.10` `8.1.23` `8.0.30`](https://www.php.net/ChangeLog-8.php#8.1.23) * [nginx `1.25.3`](https://nginx.org/en/CHANGES) +* [Kubernetes `1.29.0`](https://hub.nuaa.cf/kubernetes/kubernetes/releases/tag/v1.29.0) diff --git a/kubernetes/.env.example b/kubernetes/.env.example index bca24450e..d4f5bba02 100644 --- a/kubernetes/.env.example +++ b/kubernetes/.env.example @@ -1,4 +1,4 @@ -KUBERNETES_VERSION=1.28.0 +KUBERNETES_VERSION=1.29.0 # KUBERNETES_VERSION= diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index b29c87a4d..cbbf1851d 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -46,21 +46,21 @@ jobs: # next version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.29.0-alpha.1 + CI_KUBERNETES_VERSION: 1.30.0-alpha.1 LNMP_K8S_GET: --url GENERATE_CLI_HELP: "true" # current stable version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.28.0 + CI_KUBERNETES_VERSION: 1.29.0 LNMP_K8S_LOCAL_INSTALL_OPTIONS: --crio K8S_IMAGE_NS: khs1994 K8S_IMAGE_REGISTRY: useccr.ccs.tencentyun.com UPLOAD_TO_CODING: "true" - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.28.0 + CI_KUBERNETES_VERSION: 1.29.0 LNMP_K8S_GET: --url GENERATE_CLI_HELP: "true" @@ -69,12 +69,12 @@ jobs: # ipv6 # - os: ubuntu # dist: 20.04 - # CI_KUBERNETES_VERSION: 1.28.0 + # CI_KUBERNETES_VERSION: 1.29.0 # LNMP_K8S_GET: --url # IPV6: "true" - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.28.0 + CI_KUBERNETES_VERSION: 1.29.0 LNMP_K8S_GET: --url CNI_CALICO_EBPF: 'true' # v1.24.0+ not support docker @@ -84,22 +84,22 @@ jobs: # LNMP_K8S_LOCAL_INSTALL_OPTIONS: --docker - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.28.0 + CI_KUBERNETES_VERSION: 1.29.0 LNMP_K8S_GET: --url K8S_ROOT: /opt/k8s-custom # old version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.27.4 + CI_KUBERNETES_VERSION: 1.28.6 LNMP_K8S_GET: --url - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.26.7 + CI_KUBERNETES_VERSION: 1.27.10 + LNMP_K8S_GET: --url + - os: ubuntu + dist: 20.04 + CI_KUBERNETES_VERSION: 1.26.13 LNMP_K8S_GET: --url - # - os: ubuntu - # dist: 20.04 - # CI_KUBERNETES_VERSION: 1.25.32 - # LNMP_K8S_GET: --url fail-fast: false steps: - uses: actions/checkout@v3 @@ -516,7 +516,7 @@ jobs: export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH BASE_BRANCH=master # BASE_BRANCH=v1.25.0-config - if ! [ $CI_KUBERNETES_VERSION = '1.28.0' -a "$GENERATE_CLI_HELP" = "true" ];then + if ! [ $CI_KUBERNETES_VERSION = '1.29.0' -a "$GENERATE_CLI_HELP" = "true" ];then exit 0 fi @@ -545,7 +545,7 @@ jobs: BASE_BRANCH=v1.29.0-alpha.1-config BASE_BRANCH=master BASE_BRANCH=v1.28.0-config - if [ $CI_KUBERNETES_VERSION != '1.29.0-alpha.1' ];then + if [ $CI_KUBERNETES_VERSION != '1.30.0-alpha.1' ];then exit 0 fi diff --git a/kubernetes/bin/lwpm.ps1 b/kubernetes/bin/lwpm.ps1 index 46da5bd84..98e33db71 100644 --- a/kubernetes/bin/lwpm.ps1 +++ b/kubernetes/bin/lwpm.ps1 @@ -1,9 +1,9 @@ $env:LWPM_DOCKER_REGISTRY="mirror.ccs.tencentyun.com" ./lnmp/windows/lnmp-windows-pm.ps1 add ` - kubernetes-node@1.28.0 ` + kubernetes-node@1.29.0 ` --all-platform $env:LWPM_DOCKER_REGISTRY=$env:LWPM_DOCKER_REGISTRY_MIRROR -./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@1.28.0 +./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@1.29.0 diff --git a/kubernetes/cfssl/Dockerfile b/kubernetes/cfssl/Dockerfile index 939b1c90a..9c959c817 100644 --- a/kubernetes/cfssl/Dockerfile +++ b/kubernetes/cfssl/Dockerfile @@ -1,6 +1,6 @@ FROM --platform=${TARGETPLATFORM} alpine:edge as tool -ENV KUBECTL_VERSION=v1.28.0 +ENV KUBECTL_VERSION=v1.29.0 ARG TARGETARCH diff --git a/kubernetes/docker-compose.bump.yml b/kubernetes/docker-compose.bump.yml index 2ab7f9d37..02704c1bb 100644 --- a/kubernetes/docker-compose.bump.yml +++ b/kubernetes/docker-compose.bump.yml @@ -1,8 +1,6 @@ - - services: k8s_apiserver: - image: registry.k8s.io/kube-apiserver:v1.28.0 + image: registry.k8s.io/kube-apiserver:v1.29.0 etcd: image: quay.io/coreos/etcd:v3.5.8 diff --git a/kubernetes/kubernetes-release/Dockerfile b/kubernetes/kubernetes-release/Dockerfile index 947c81c63..149922712 100644 --- a/kubernetes/kubernetes-release/Dockerfile +++ b/kubernetes/kubernetes-release/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV KUBERNETES_VERSION=v1.28.0 +ENV KUBERNETES_VERSION=v1.29.0 # ENV KUBERNETES_VERSION= diff --git a/kubernetes/kubernetes-release/Dockerfile.buildx b/kubernetes/kubernetes-release/Dockerfile.buildx index e127c911d..13ab9f7cd 100644 --- a/kubernetes/kubernetes-release/Dockerfile.buildx +++ b/kubernetes/kubernetes-release/Dockerfile.buildx @@ -6,7 +6,7 @@ FROM alpine -ARG KUBERNETES_VERSION=v1.28.0 +ARG KUBERNETES_VERSION=v1.29.0 # ARG KUBERNETES_VERSION= diff --git a/kubernetes/kubernetes-release/release/stable.txt b/kubernetes/kubernetes-release/release/stable.txt index c70e54109..9b277b94a 100644 --- a/kubernetes/kubernetes-release/release/stable.txt +++ b/kubernetes/kubernetes-release/release/stable.txt @@ -1 +1 @@ -v1.28.0 +v1.29.0 diff --git a/kubernetes/rpi/README.md b/kubernetes/rpi/README.md index 635457a29..30dce3a17 100644 --- a/kubernetes/rpi/README.md +++ b/kubernetes/rpi/README.md @@ -24,7 +24,7 @@ $ foreach($item in $items){scp ./wsl2/certs/$item pi@192.168.199.101:/home/pi/ln $ $items="kube-proxy","kubelet","kubectl","kubeadm","mounter" -$ foreach($item in $items){scp ./kubernetes-release/release/v1.28.0-linux-arm64/kubernetes/server/bin/$item pi@192.168.199.101:/home/pi/} +$ foreach($item in $items){scp ./kubernetes-release/release/v1.29.0-linux-arm64/kubernetes/server/bin/$item pi@192.168.199.101:/home/pi/} ``` ## 登录到树莓派 diff --git a/kubernetes/wsl2/00-README.NODE.md b/kubernetes/wsl2/00-README.NODE.md index cdc8ef999..c340c8d50 100644 --- a/kubernetes/wsl2/00-README.NODE.md +++ b/kubernetes/wsl2/00-README.NODE.md @@ -44,8 +44,8 @@ $ ./wsl2/bin/kube-check $ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION" $ $env:K8S_ROOT="/wsl/wsl-k8s-data/k8s" -# 请将 1.28.0 替换为实际的 k8s 版本号 -$ $env:KUBERNETES_VERSION='1.28.0' +# 请将 1.29.0 替换为实际的 k8s 版本号 +$ $env:KUBERNETES_VERSION='1.29.0' $ wsl -d wsl-k8s -- sh -xc 'mkdir -p ${K8S_ROOT:?err}/bin' $ wsl -d wsl-k8s -- bash -xc 'cp -a kubernetes-release/release/v${KUBERNETES_VERSION}-linux-amd64/kubernetes/server/bin/{kube-proxy,kubectl,kubelet,kubeadm,mounter} ${K8S_ROOT:?err}/bin' diff --git a/kubernetes/wsl2/00-README.SERVER.md b/kubernetes/wsl2/00-README.SERVER.md index f7ec52c20..c9d093ac6 100644 --- a/kubernetes/wsl2/00-README.SERVER.md +++ b/kubernetes/wsl2/00-README.SERVER.md @@ -211,8 +211,8 @@ $ wsl -d wsl-k8s -- sh -xc 'cp ${K8S_ROOT:?err}/etc/kubernetes/pki/*.yaml $ wsl -d wsl-k8s -- sh -xc 'cp ${K8S_ROOT:?err}/etc/kubernetes/pki/*.kubeconfig ${K8S_ROOT:?err}/etc/kubernetes' $ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION" -# 请将 1.28.0 替换为实际的 k8s 版本号 -$ $env:KUBERNETES_VERSION='1.28.0' +# 请将 1.29.0 替换为实际的 k8s 版本号 +$ $env:KUBERNETES_VERSION='1.29.0' $ wsl -d wsl-k8s -- bash -xc 'cp -a kubernetes-release/release/v${KUBERNETES_VERSION}-linux-amd64/kubernetes/server/bin/kube-{apiserver,controller-manager,scheduler} ${K8S_ROOT:?err}/bin' ``` diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index cc327dbd5..326123032 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -1,5 +1,3 @@ - - services: mysql: image: mysql:8.0.33 diff --git a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json index 92f928311..e218883c4 100644 --- a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json @@ -4,10 +4,7 @@ "platform": [ { "architecture": "amd64", - "os": "windows", - "hash": { - "sha256": "9c5a270f1c23878f247fb9846b8046cb3fd3cd55066ea767d68dfc9c30a7871c" - } + "os": "windows" }, { "architecture": "amd64", @@ -32,5 +29,5 @@ }, "url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", "url-mirror": "https://${env:GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "version": "1.27.0" + "version": "1.29.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml index b1f419016..abca64cf2 100644 --- a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml @@ -1,5 +1,5 @@ name: crictl -version: 1.27.0 +version: 1.29.0 url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" url-mirror: https://${env:GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz command: crictl @@ -19,8 +19,8 @@ scripts: platform: - architecture: amd64 os: windows - hash: - sha256: 9c5a270f1c23878f247fb9846b8046cb3fd3cd55066ea767d68dfc9c30a7871c + # hash: + # sha256: 9c5a270f1c23878f247fb9846b8046cb3fd3cd55066ea767d68dfc9c30a7871c - architecture: amd64 os: linux - architecture: arm64 diff --git a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json index d2e0d796e..298101c85 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json @@ -30,5 +30,5 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-client-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n", "install": "curl -L `\n https://mirror.azure.cn/kubernetes/kubectl/v${VERSION}/bin/windows/amd64/kubectl.exe `\n -o C:/bin/kubectl.exe\n" }, - "version": "1.27.0" + "version": "1.29.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml index f01098c14..a37e1e796 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml @@ -1,5 +1,5 @@ name: kubectl -version: 1.27.0 +version: 1.29.0 # url: "https://mirror.azure.cn/kubernetes/kubectl/v${VERSION}/bin/linux/amd64/kubectl" # url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-client-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" scripts: diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json index 4e2ffa241..bc9048874 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json @@ -21,5 +21,5 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n" }, "url": "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-node-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "version": "1.27.0" + "version": "1.29.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml index 05e95a927..eef1b318e 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml @@ -1,5 +1,5 @@ name: kubernetes-node -version: 1.27.0 +version: 1.29.0 url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-node-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" scripts: platform-reqs: if($IsMacOS){echo $False} diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json index 758d98b20..5c6b8d8a2 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json @@ -17,5 +17,5 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n" }, "url": "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-server-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "version": "1.27.0" + "version": "1.29.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml index 4843a8944..10a468e7c 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml @@ -1,5 +1,5 @@ name: kubernetes-server -version: 1.27.0 +version: 1.29.0 url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-server-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" scripts: platform-reqs: if(!$IsLinux){echo $False} From f902880fd27ecc45ec09d08562ebf8bd1c86170d Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 11 Feb 2024 12:37:32 +0800 Subject: [PATCH 33/42] [MariaDB] Update compose file Signed-off-by: Kang Huaishuai --- lrew/mariadb/docker-compose.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lrew/mariadb/docker-compose.yml b/lrew/mariadb/docker-compose.yml index b64f3ed3a..d0eac4223 100644 --- a/lrew/mariadb/docker-compose.yml +++ b/lrew/mariadb/docker-compose.yml @@ -1,5 +1,3 @@ - - x-common: &common restart: always @@ -24,7 +22,7 @@ services: image: "${LNMP_LIBRARY_NS:-library}/mariadb:${LNMP_MARIADB_VERSION:-10.11.5}" environment: # @link https://github.com/docker-library/docs/tree/master/mariadb#environment-variables - MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_root_password + MYSQL_ROOT_PASSWORD_FILE: /run/secrets/mariadb_db_root_password # MYSQL_ROOT_PASSWORD: ${LNMP_MYSQL_ROOT_PASSWORD:-mytest} MYSQL_DATABASE: ${LNMP_MYSQL_DATABASE:-test} # MYSQL_USER: @@ -44,7 +42,7 @@ services: - mysqld - --character-set-server=utf8mb4 secrets: - - db_root_password + - mariadb_db_root_password # - source: mariadb_conf # target: /etc/mysql/conf.d/my.cnf # mode: 0644 @@ -52,10 +50,10 @@ services: # gid: "999" healthcheck: # test: ["CMD", "mysqladmin", "ping", "-p${LNMP_MYSQL_ROOT_PASSWORD:-mytest}"] - test: ["CMD-SHELL", "mysqladmin ping -p`cat /run/secrets/db_root_password`"] + test: ["CMD-SHELL", "mysqladmin ping -p`cat /run/secrets/mariadb_db_root_password`"] secrets: - db_root_password: + mariadb_db_root_password: << : *common-label file: ./secrets/${LNMP_DB_ROOT_PASSWORD_PATH:-db_root_password.txt} # mariadb_conf: From 53d1d6e75e687ef861d11fc6f5bdba56b6ecae51 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 11 Feb 2024 13:56:33 +0800 Subject: [PATCH 34/42] [PHP] update to v8.2.13 v8.1.26 v8.0.30 Signed-off-by: Kang Huaishuai --- .env.example | 8 ++-- .env.example.ps1 | 2 +- .../setup-php/.github/workflows/ci.yaml | 4 +- .github/actions/setup-php/action.yml | 2 +- .github/actions/setup-php/package.json | 2 +- .github/workflows/release.yaml | 22 +++++----- .pcit.yml | 2 +- CHANGELOG.md | 8 ++-- README.cn.md | 6 +-- README.md | 6 +-- app/demo/.drone.yml | 14 +++--- app/demo/.env.example | 4 +- app/demo/.github/workflows/ci.yml | 2 +- app/demo/.pcit.yml | 8 ++-- app/demo/Dockerfile | 4 +- app/demo/deploy/test.Dockerfile | 2 +- app/demo/docker-compose.yml | 6 +-- app/demo/docker-workspace.yml | 4 +- app/laravel-demo/Dockerfile | 4 +- app/laravel-demo/Dockerfile.buildkit | 4 +- app/laravel-demo/Dockerfile.cdn | 4 +- docker-lnmp.override.example.yml | 8 ++-- docker-lnmp.yml | 4 +- docker-production.yml | 4 +- docker-workspace.example.yml | 4 +- dockerfile/php/.env.example | 4 +- dockerfile/php/.github/workflows/php_8_1.yml | 4 +- dockerfile/php/.github/workflows/php_8_2.yml | 4 +- .../php/.github/workflows/php_zz_tool.yml | 4 +- dockerfile/php/8.1/cli/Dockerfile | 6 +-- dockerfile/php/8.1/composer/Dockerfile | 2 +- dockerfile/php/8.1/fpm/Dockerfile | 4 +- dockerfile/php/8.1/s6/Dockerfile | 2 +- dockerfile/php/8.1/swoole/Dockerfile | 4 +- dockerfile/php/8.1/unit/Dockerfile | 2 +- dockerfile/php/8.2/cli/Dockerfile | 6 +-- dockerfile/php/8.2/composer/Dockerfile | 2 +- dockerfile/php/8.2/fpm/Dockerfile | 4 +- dockerfile/php/8.2/s6/Dockerfile | 2 +- dockerfile/php/8.2/swoole/Dockerfile | 4 +- dockerfile/php/8.2/unit/Dockerfile | 2 +- dockerfile/php/8.3/cli/Dockerfile | 2 +- dockerfile/php/8.3/fpm/Dockerfile | 2 +- dockerfile/php/CHANGELOG.md | 8 +++- dockerfile/php/README.md | 26 +++++------ dockerfile/php/nightly/cli/Dockerfile | 2 +- dockerfile/php/nightly/fpm/Dockerfile | 2 +- dockerfile/php/php-cs-fixer/Dockerfile | 2 +- dockerfile/php/phploc/Dockerfile | 2 +- dockerfile/php/sync/docker-image-sync.json | 24 +++++----- dockerfile/php/sync/manifest.txt | 24 +++++----- dockerfile/php/tests/git/Dockerfile | 2 +- dockerfile/sync/docker-image-sync.json | 12 ++--- docs/custom.md | 4 +- kubernetes/lnmp/php/base/lnmp-php.yaml | 2 +- lrew/nginx-unit/docker-compose.yml | 2 +- scripts/docker-compose.bump.yml | 2 +- vscode-remote/docker-workspace.yml | 4 +- windows/lnmp-windows-pm-repo/php/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/php/lwpm.yaml | 4 +- wsl/.env | 4 +- wsl/Dockerfile | 2 +- wsl/docker-compose.yml | 44 +++++++++---------- wsl/lnmp-wsl-builder-php | 2 +- wsl/lnmp-wsl-builder-php-rhel | 2 +- wsl/wsl.phpbuilder.Dockerfile | 2 +- wsl/wsl.phpbuilder.rhel.Dockerfile | 2 +- 67 files changed, 193 insertions(+), 189 deletions(-) diff --git a/.env.example b/.env.example index a73e92c1b..30100c20e 100644 --- a/.env.example +++ b/.env.example @@ -123,7 +123,7 @@ LNMP_NGINX_VERSION=1.25.3 LNMP_MYSQL_VERSION=8.0.33 -LNMP_PHP_VERSION=8.2.10 +LNMP_PHP_VERSION=8.2.13 # LNMP_PHP_VERSION=nightly # PHP EOL VERSION @@ -137,10 +137,10 @@ LNMP_PHP73_VERSION=7.3.33 LNMP_PHP74_VERSION=7.4.33 # PHP EOL VERSION END -LNMP_PHP8_VERSION=8.2.10 +LNMP_PHP8_VERSION=8.2.13 LNMP_PHP80_VERSION=8.0.30 -LNMP_PHP81_VERSION=8.1.23 -LNMP_PHP82_VERSION=8.2.10 +LNMP_PHP81_VERSION=8.1.26 +LNMP_PHP82_VERSION=8.2.13 LNMP_PHP83_VERSION=8.3.0 LNMP_REDIS_VERSION=7.0.0 diff --git a/.env.example.ps1 b/.env.example.ps1 index 55d53799c..e001b666d 100644 --- a/.env.example.ps1 +++ b/.env.example.ps1 @@ -7,7 +7,7 @@ $CI_HOST="ci.khs1994.com:1218" # $ wsl -l $DistributionName="Ubuntu-22.04" -$LNMP_PHP_IMAGE="khs1994/php:8.2.10-composer-alpine" +$LNMP_PHP_IMAGE="khs1994/php:8.2.13-composer-alpine" $NGINX_PATH="C:/nginx" $PHP_PATH="C:/php" diff --git a/.github/actions/setup-php/.github/workflows/ci.yaml b/.github/actions/setup-php/.github/workflows/ci.yaml index ecfaf874f..549794e25 100644 --- a/.github/actions/setup-php/.github/workflows/ci.yaml +++ b/.github/actions/setup-php/.github/workflows/ci.yaml @@ -10,8 +10,8 @@ jobs: matrix: php_version: - nightly - - 8.2.10 - - 8.1.23 + - 8.2.13 + - 8.1.26 - 8.0.30 # EOL - 7.4.33 diff --git a/.github/actions/setup-php/action.yml b/.github/actions/setup-php/action.yml index 02fa2959c..f8682ad7c 100644 --- a/.github/actions/setup-php/action.yml +++ b/.github/actions/setup-php/action.yml @@ -6,7 +6,7 @@ author: 'khs1994' inputs: php_version: description: PHP version - default: "8.2.10" + default: "8.2.13" required: false php_type: description: php image type, fpm | composer | swoole | php-cs-fixer | doctum diff --git a/.github/actions/setup-php/package.json b/.github/actions/setup-php/package.json index fb719b8be..54c658aec 100644 --- a/.github/actions/setup-php/package.json +++ b/.github/actions/setup-php/package.json @@ -12,7 +12,7 @@ }, "devDependencies": {}, "scripts": { - "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.2.10' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" + "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.2.13' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" }, "author": "", "license": "ISC" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cd6c1b9d7..b5dfbcfae 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,33 +18,33 @@ jobs: - JOB_NAME: wsl-php-builder-80 DIST_FILE: khs1994-wsl-php80_8.0.30-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-81 - DIST_FILE: khs1994-wsl-php81_8.1.23-debian-bullseye_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-nightly DIST_FILE: khs1994-wsl-php83_0.0.0-debian-bullseye_amd64.deb - JOB_NAME: wsl-php-builder-debian12-81 - DIST_FILE: khs1994-wsl-php81_8.1.23-debian-bookworm_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-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-81 - DIST_FILE: khs1994-wsl-php81_8.1.23-ubuntu-bionic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-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-81 - DIST_FILE: khs1994-wsl-php81_8.1.23-ubuntu-focal_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-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-81 - DIST_FILE: khs1994-wsl-php81_8.1.23-ubuntu-jammy_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2204-nightly DIST_FILE: khs1994-wsl-php83_0.0.0-ubuntu-jammy_amd64.deb - JOB_NAME: wsl-php-builder-ubuntu2210-81 - DIST_FILE: khs1994-wsl-php81_8.1.23-ubuntu-kinetic_amd64.deb + DIST_FILE: khs1994-wsl-php81_8.1.26-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 @@ -52,23 +52,23 @@ jobs: - 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-rhel8-81 - DIST_FILE: khs1994-wsl-php81-8.1.23-1.el8.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.26-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-81 - DIST_FILE: khs1994-wsl-php81-8.1.23-1.el9.centos.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.26-1.el9.centos.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky8-81 - DIST_FILE: khs1994-wsl-php81-8.1.23-1.el8.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.26-1.el8.rocky.x86_64.rpm - JOB_NAME: wsl-php-builder-rocky9-81 - DIST_FILE: khs1994-wsl-php81-8.1.23-1.el9.rocky.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.26-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-81 - DIST_FILE: khs1994-wsl-php81-8.1.23-1.fc36.x86_64.rpm + DIST_FILE: khs1994-wsl-php81-8.1.26-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 - JOB_NAME: wsl-php-builder-fc37-nightly diff --git a/.pcit.yml b/.pcit.yml index 44552e830..9f3052b18 100644 --- a/.pcit.yml +++ b/.pcit.yml @@ -4,7 +4,7 @@ workspace: steps: bash: - image: khs1994/php:8.2.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine run: - pwd - bash ./lnmp-docker diff --git a/CHANGELOG.md b/CHANGELOG.md index a9e890b8a..f617b32c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Changelog -## v20.10.28 +## v20.10.30 ### Compare -* https://github.com/khs1994-docker/lnmp/compare/v20.10.27...20.10 +* https://github.com/khs1994-docker/lnmp/compare/v20.10.29...20.10 ### Bug fixes: @@ -12,6 +12,4 @@ ### Updates: -* [PHP `8.2.10` `8.1.23` `8.0.30`](https://www.php.net/ChangeLog-8.php#8.1.23) -* [nginx `1.25.3`](https://nginx.org/en/CHANGES) -* [Kubernetes `1.29.0`](https://hub.nuaa.cf/kubernetes/kubernetes/releases/tag/v1.29.0) +* [PHP `8.2.13` `8.1.26` `8.0.30`](https://www.php.net/ChangeLog-8.php#8.1.26) diff --git a/README.cn.md b/README.cn.md index 1f8d34a9a..5fa1b4138 100644 --- a/README.cn.md +++ b/README.cn.md @@ -211,13 +211,13 @@ $ ./lnmp-docker down |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.3-alpine` | **1.25.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.10-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.13-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.5` | **10.11.5** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.10-fpm-alpine` | **8.2.10** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.10-composer-alpine`| **2.5.8** |`alpine:3.16` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.13-fpm-alpine` | **8.2.13** |`alpine:3.19` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.13-composer-alpine`| **2.5.8** |`alpine:3.19` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/README.md b/README.md index ba2d6e63a..95d097fe2 100644 --- a/README.md +++ b/README.md @@ -206,13 +206,13 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.3-alpine` | **1.25.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.10-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.13-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.5` | **10.11.5** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.10-fpm-alpine` | **8.2.10** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.10-composer-alpine`| **2.5.8** |`alpine:3.16` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.13-fpm-alpine` | **8.2.13** |`alpine:3.19` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.13-composer-alpine`| **2.5.8** |`alpine:3.19` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/app/demo/.drone.yml b/app/demo/.drone.yml index 78b564ff1..57e34c629 100644 --- a/app/demo/.drone.yml +++ b/app/demo/.drone.yml @@ -34,7 +34,7 @@ steps: # install dep - name: install # image: composer:2.5.8 - image: khs1994/php:8.2.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine commands: - pwd - composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/ @@ -46,7 +46,7 @@ steps: # test script - name: script - image: khs1994/php:8.2.10-fpm-alpine + image: khs1994/php:8.2.13-fpm-alpine # pull: always | never | if-not-exists # detach: true # privileged: true @@ -92,7 +92,7 @@ steps: settings: # registry: docker.khs1994.com repo: khs1994/php - tags: 8.2.10-pro-${DRONE_TAG}-alpine + tags: 8.2.13-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com # build_args: @@ -142,7 +142,7 @@ steps: image: plugins/docker settings: repo: khs1994/php - tags: 8.2.10-pro-${DRONE_TAG}-alpine + tags: 8.2.13-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com username: @@ -179,7 +179,7 @@ steps: event: [ tag ] - name: after_success - image: khs1994/php:8.2.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine when: status: success commands: @@ -228,8 +228,8 @@ volumes: # COMPOSER_VERSION: # - 2.5.8 # PHP_VERSION: -# - 8.2.10 -# - 8.1.23 +# - 8.2.13 +# - 8.1.26 # - 8.0.30 # # - 7.4.33 # # - 7.3.33 diff --git a/app/demo/.env.example b/app/demo/.env.example index e7fef36c9..9cd42d89f 100644 --- a/app/demo/.env.example +++ b/app/demo/.env.example @@ -1,7 +1,7 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION=8.2.10 -# PHP_VERSION=8.1.23 +PHP_VERSION=8.2.13 +# PHP_VERSION=8.1.26 # PHP_VERSION=8.0.30 # PHP_VERSION=7.4.33 # PHP_VERSION=7.3.33 diff --git a/app/demo/.github/workflows/ci.yml b/app/demo/.github/workflows/ci.yml index ec162f597..6bf2e2f2b 100644 --- a/app/demo/.github/workflows/ci.yml +++ b/app/demo/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: test: strategy: matrix: - php_version: ["8.0.30","8.1.23","8.2.10"] + php_version: ["8.0.30","8.1.26","8.2.13"] runs-on: ubuntu-latest # needs: job steps: diff --git a/app/demo/.pcit.yml b/app/demo/.pcit.yml index dde14f2bf..30f6fb5fc 100644 --- a/app/demo/.pcit.yml +++ b/app/demo/.pcit.yml @@ -16,7 +16,7 @@ steps: # install dep install: # image: composer:${COMPOSER_VERSION} - image: khs1994/php:8.2.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine shell: bash run: - pwd @@ -80,7 +80,7 @@ steps: event: tag after_success: - image: khs1994/php:8.2.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine shell: bash if: status: success @@ -129,8 +129,8 @@ jobs: COMPOSER_VERSION: - 2.5.8 PHP_VERSION: - - 8.2.10 - - 8.1.23 + - 8.2.13 + - 8.1.26 - 8.0.30 # - 7.4.33 # - 7.3.33 diff --git a/app/demo/Dockerfile b/app/demo/Dockerfile index 28ebc17d3..671688ea5 100644 --- a/app/demo/Dockerfile +++ b/app/demo/Dockerfile @@ -9,7 +9,7 @@ # !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !! ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG NGINX_VERSION=1.15.0 ARG DOCKER_HUB_USERNAME=khs1994 @@ -28,7 +28,7 @@ RUN cd /app \ --no-plugins # 2.将项目打入 PHP 镜像 -# $ docker build -t khs1994/php:8.2.10-pro-GIT_TAG-alpine --target=php . +# $ docker build -t khs1994/php:8.2.13-pro-GIT_TAG-alpine --target=php . FROM ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION}-fpm-alpine as php diff --git a/app/demo/deploy/test.Dockerfile b/app/demo/deploy/test.Dockerfile index 1f26f4dbf..821d30408 100644 --- a/app/demo/deploy/test.Dockerfile +++ b/app/demo/deploy/test.Dockerfile @@ -2,7 +2,7 @@ # TEST PHP PROJECT BY Docker # -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG GIT_REPO={{ EXAMPLE_GIT_URL_EXAMPLE }}/{{ EXAMPLE_GIT_USERNAME_EXAMPLE }}/{{ EXAMPLE_GIT_REPO_EXAMPLE }}.git FROM khs1994/php:${PHP_VERSION}-composer-alpine diff --git a/app/demo/docker-compose.yml b/app/demo/docker-compose.yml index eba27032c..7d95638dc 100644 --- a/app/demo/docker-compose.yml +++ b/app/demo/docker-compose.yml @@ -19,7 +19,7 @@ services: context: . dockerfile: deploy/test.Dockerfile args: - - PHP_VERSION=${PHP_VERSION:-8.2.10} + - PHP_VERSION=${PHP_VERSION:-8.2.13} image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE nginx: @@ -39,7 +39,7 @@ services: dockerfile: Dockerfile target: php args: - - PHP_VERSION=${PHP_VERSION:-8.2.10} + - PHP_VERSION=${PHP_VERSION:-8.2.13} - NODE_VERSION=${NODE_VERSION:-20.5.1} - NODE_REGISTRY=https://registry.npmmirror.com - image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.10}-pro-alpine + image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.13}-pro-alpine diff --git a/app/demo/docker-workspace.yml b/app/demo/docker-workspace.yml index 0e375b5e8..80c1fb616 100644 --- a/app/demo/docker-workspace.yml +++ b/app/demo/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine networks: - backend volumes: @@ -67,7 +67,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.10-composer-alpine" + image: "khs1994/php:8.2.13-composer-alpine" command: [] # install | update npm: diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index d52969273..1cb44e0da 100644 --- a/app/laravel-demo/Dockerfile +++ b/app/laravel-demo/Dockerfile @@ -14,12 +14,12 @@ # $ docker build --target=laravel -t khs1994/laravel:10 --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.10-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.buildkit b/app/laravel-demo/Dockerfile.buildkit index 79fba601f..91847b449 100644 --- a/app/laravel-demo/Dockerfile.buildkit +++ b/app/laravel-demo/Dockerfile.buildkit @@ -16,12 +16,12 @@ # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.buildkit --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.10-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY --link composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.cdn b/app/laravel-demo/Dockerfile.cdn index a4274f185..36bbed815 100644 --- a/app/laravel-demo/Dockerfile.cdn +++ b/app/laravel-demo/Dockerfile.cdn @@ -15,12 +15,12 @@ # # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.cdn --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.10-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/docker-lnmp.override.example.yml b/docker-lnmp.override.example.yml index 94a808957..ffadb1398 100644 --- a/docker-lnmp.override.example.yml +++ b/docker-lnmp.override.example.yml @@ -27,11 +27,11 @@ services: # php8: # &php8 # # ! change php8 default image - # image: username/php:${LNMP_PHP8_VERSION:-8.2.10}-fpm-alpine + # image: username/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine # # ! cn mirror image - # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.10}-fpm-alpine + # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine # # ! s6 - # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.10}-s6-alpine + # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.13}-s6-alpine # # command: [] # # ! open more port # ports: @@ -74,7 +74,7 @@ services: swoole: << : *common - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.10}-swoole-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-swoole-alpine # command 指令只需传入文件名即可 command: - /app/swoole/index.php diff --git a/docker-lnmp.yml b/docker-lnmp.yml index ec7038485..48f3a6122 100644 --- a/docker-lnmp.yml +++ b/docker-lnmp.yml @@ -169,7 +169,7 @@ services: php8: &php8 << : [*common,*common-labels] - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.10}-fpm-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} @@ -220,7 +220,7 @@ services: composer: << : [*common,*common-labels] restart: "no" - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.10}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} diff --git a/docker-production.yml b/docker-production.yml index a95a23634..b3f40f3da 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -74,7 +74,7 @@ x-build-debian: x-php-common: &default-php - image: khs1994/php:8.2.10-fpm-alpine + image: khs1994/php:8.2.13-fpm-alpine volumes: - ./app:/app - type: volume @@ -364,7 +364,7 @@ services: - *common - *default-labels - *default-php - # image: khs1994/php:8.2.10-s6-alpine + # image: khs1994/php:8.2.13-s6-alpine # entrypoint: # - /s6-init build: diff --git a/docker-workspace.example.yml b/docker-workspace.example.yml index 49c3a0a14..7ad68ab1b 100644 --- a/docker-workspace.example.yml +++ b/docker-workspace.example.yml @@ -11,7 +11,7 @@ x-common: services: workspace: &workspace - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.10}-composer-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine networks: - backend volumes: @@ -71,7 +71,7 @@ services: << : - *workspace - *common - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.10}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine" command: [] # install | update npm: diff --git a/dockerfile/php/.env.example b/dockerfile/php/.env.example index 452e76353..c454f3c21 100644 --- a/dockerfile/php/.env.example +++ b/dockerfile/php/.env.example @@ -1,8 +1,8 @@ DOCKER_HUB_USERNAME=khs1994 PHP_VERSION_83=8.3.0 -PHP_VERSION_82=8.2.10 -PHP_VERSION_81=8.1.23 +PHP_VERSION_82=8.2.13 +PHP_VERSION_81=8.1.26 PHP_VERSION_80=8.0.30 # EOL PHP_VERSION_74=7.4.33 diff --git a/dockerfile/php/.github/workflows/php_8_1.yml b/dockerfile/php/.github/workflows/php_8_1.yml index 5b542c5df..23f7332e9 100644 --- a/dockerfile/php/.github/workflows/php_8_1.yml +++ b/dockerfile/php/.github/workflows/php_8_1.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.1.23" + default: "8.1.26" name: PHP_8.1 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.23" + PHP_TAG_VERSION: "8.1.26" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_8_2.yml b/dockerfile/php/.github/workflows/php_8_2.yml index 733888b5c..e83b582ca 100644 --- a/dockerfile/php/.github/workflows/php_8_2.yml +++ b/dockerfile/php/.github/workflows/php_8_2.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.2.10" + default: "8.2.13" name: PHP_8.2 @@ -194,7 +194,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_2_X FOLDER: "8.2" - PHP_TAG_VERSION: "8.2.10" + PHP_TAG_VERSION: "8.2.13" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/.github/workflows/php_zz_tool.yml b/dockerfile/php/.github/workflows/php_zz_tool.yml index 42a9bc4db..f108d4b80 100644 --- a/dockerfile/php/.github/workflows/php_zz_tool.yml +++ b/dockerfile/php/.github/workflows/php_zz_tool.yml @@ -9,7 +9,7 @@ on: PHP_VERSION: description: php version required: true - default: "8.1.23" + default: "8.1.26" name: PHP_TOOL @@ -180,7 +180,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7 PHP_VERSION: 8_1_X FOLDER: "8.1" - PHP_TAG_VERSION: "8.1.23" + PHP_TAG_VERSION: "8.1.26" TYPE: ${{ matrix.TYPE }} add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php name: 'Build Image' diff --git a/dockerfile/php/8.1/cli/Dockerfile b/dockerfile/php/8.1/cli/Dockerfile index 12e946c9c..a0d161ed4 100644 --- a/dockerfile/php/8.1/cli/Dockerfile +++ b/dockerfile/php/8.1/cli/Dockerfile @@ -1,16 +1,16 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream -FROM --platform=$TARGETPLATFORM alpine:3.17 +FROM --platform=$TARGETPLATFORM alpine:3.19 LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.1/composer/Dockerfile b/dockerfile/php/8.1/composer/Dockerfile index f432e991b..06a56fade 100644 --- a/dockerfile/php/8.1/composer/Dockerfile +++ b/dockerfile/php/8.1/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.1/fpm/Dockerfile b/dockerfile/php/8.1/fpm/Dockerfile index 428dbd1a8..5be0dd912 100644 --- a/dockerfile/php/8.1/fpm/Dockerfile +++ b/dockerfile/php/8.1/fpm/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 -FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php +FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.19 as php LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/8.1/s6/Dockerfile b/dockerfile/php/8.1/s6/Dockerfile index a68fc559e..efe3fc1f2 100644 --- a/dockerfile/php/8.1/s6/Dockerfile +++ b/dockerfile/php/8.1/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.1/swoole/Dockerfile b/dockerfile/php/8.1/swoole/Dockerfile index 1b9ca16de..417ee44ba 100644 --- a/dockerfile/php/8.1/swoole/Dockerfile +++ b/dockerfile/php/8.1/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.3 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.1.23-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.1.26-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.1/unit/Dockerfile b/dockerfile/php/8.1/unit/Dockerfile index c55cfaf34..9c6ad64e3 100644 --- a/dockerfile/php/8.1/unit/Dockerfile +++ b/dockerfile/php/8.1/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/8.2/cli/Dockerfile b/dockerfile/php/8.2/cli/Dockerfile index 14eaaed4f..5bde626f9 100644 --- a/dockerfile/php/8.2/cli/Dockerfile +++ b/dockerfile/php/8.2/cli/Dockerfile @@ -1,16 +1,16 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream -FROM --platform=$TARGETPLATFORM alpine:3.17 +FROM --platform=$TARGETPLATFORM alpine:3.19 LABEL maintainer="khs1994-docker/lnmp " ENV TZ=Asia/Shanghai \ APP_ENV=development -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/php/8.2/composer/Dockerfile b/dockerfile/php/8.2/composer/Dockerfile index 9891d1dee..dd497a5ee 100644 --- a/dockerfile/php/8.2/composer/Dockerfile +++ b/dockerfile/php/8.2/composer/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG USERNAME=khs1994 # ARG BASE=fpm ARG BASE=cli diff --git a/dockerfile/php/8.2/fpm/Dockerfile b/dockerfile/php/8.2/fpm/Dockerfile index 6f8781e11..dbf41bd38 100644 --- a/dockerfile/php/8.2/fpm/Dockerfile +++ b/dockerfile/php/8.2/fpm/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 -FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php +FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.19 as php LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/8.2/s6/Dockerfile b/dockerfile/php/8.2/s6/Dockerfile index f6659d9f6..e25e4da9b 100644 --- a/dockerfile/php/8.2/s6/Dockerfile +++ b/dockerfile/php/8.2/s6/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG USERNAME=khs1994 ARG BASE=fpm diff --git a/dockerfile/php/8.2/swoole/Dockerfile b/dockerfile/php/8.2/swoole/Dockerfile index 9440baa57..fc839161a 100644 --- a/dockerfile/php/8.2/swoole/Dockerfile +++ b/dockerfile/php/8.2/swoole/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG USERNAME=khs1994 ARG BASE=cli @@ -27,7 +27,7 @@ ENV SWOOLE_VERSION=v5.0.3 ARG ALPINE_URL=dl-cdn.alpinelinux.org -RUN --mount=type=bind,from=php:8.2.10-alpine,source=/usr/local/bin,target=/opt/bin,rw \ +RUN --mount=type=bind,from=php:8.2.13-alpine,source=/usr/local/bin,target=/opt/bin,rw \ set -x \ && sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \ && apk add --no-cache --virtual .pecl_build_deps \ diff --git a/dockerfile/php/8.2/unit/Dockerfile b/dockerfile/php/8.2/unit/Dockerfile index 14ff08d3f..3615d6297 100644 --- a/dockerfile/php/8.2/unit/Dockerfile +++ b/dockerfile/php/8.2/unit/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG USERNAME=khs1994 ARG BASE=cli diff --git a/dockerfile/php/8.3/cli/Dockerfile b/dockerfile/php/8.3/cli/Dockerfile index 2539f1995..08a684fc1 100644 --- a/dockerfile/php/8.3/cli/Dockerfile +++ b/dockerfile/php/8.3/cli/Dockerfile @@ -3,7 +3,7 @@ ARG PHP_VERSION=8.3.0 FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream -FROM --platform=$TARGETPLATFORM alpine:3.18 +FROM --platform=$TARGETPLATFORM alpine:3.19 LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/8.3/fpm/Dockerfile b/dockerfile/php/8.3/fpm/Dockerfile index 2ecb1a24f..90b3d19ec 100644 --- a/dockerfile/php/8.3/fpm/Dockerfile +++ b/dockerfile/php/8.3/fpm/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:labs ARG PHP_VERSION=8.3.0 -FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.18 as php +FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.19 as php LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/CHANGELOG.md b/dockerfile/php/CHANGELOG.md index 08cf06fcf..d348fd052 100644 --- a/dockerfile/php/CHANGELOG.md +++ b/dockerfile/php/CHANGELOG.md @@ -7,7 +7,7 @@ ## 8.4 -## Remove ext/imap — it has been moved to PECL +### Remove ext/imap — it has been moved to PECL * https://hub.nuaa.cf/php/php-src/commit/f62f6a6d4b9567530775d684db55e9990952c737 * https://hub.nuaa.cf/php/php-src/commits/master/ext/imap @@ -16,3 +16,9 @@ * https://hub.nuaa.cf/php/php-src/commit/b035cb6c8e31bea351f169b3e9f34fdc562e77e1 * https://hub.nuaa.cf/php/php-src/commits/master/ext/pspell + +## docker image ftp ext removed + +* 8.3.2(removed) +* 8.2.15(removed) +* 8.1.28(removed) diff --git a/dockerfile/php/README.md b/dockerfile/php/README.md index d6c0780e4..584e2f9d9 100644 --- a/dockerfile/php/README.md +++ b/dockerfile/php/README.md @@ -14,28 +14,28 @@ ## 后缀 -* 8.2.10-cli-alpine -* 8.2.10-fpm-alpine -* 8.2.10-unit-alpine (based cli) -* 8.2.10-composer-alpine (based fpm) -* 8.2.10-swoole-alpine (based cli) -* 8.2.10-s6-alpine (based fpm) +* 8.2.13-cli-alpine +* 8.2.13-fpm-alpine +* 8.2.13-unit-alpine (based cli) +* 8.2.13-composer-alpine (based fpm) +* 8.2.13-swoole-alpine (based cli) +* 8.2.13-s6-alpine (based fpm) ## Supported tags and respective `Dockerfile` links -* [`8.2.10-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.2/fpm/Dockerfile) +* [`8.2.13-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/8.2/fpm/Dockerfile) -* [`8.1.23-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.1/fpm/Dockerfile) +* [`8.1.26-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/8.1/fpm/Dockerfile) -* [`8.0.30-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.0/fpm/Dockerfile) +* [`8.0.30-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/8.0/fpm/Dockerfile) * [`nightly-fpm-alpine` (nightly/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/master/nightly/fpm/Dockerfile) -* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.4/fpm/Dockerfile) +* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/7.4/fpm/Dockerfile) -* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.3/fpm/Dockerfile) +* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/7.3/fpm/Dockerfile) -* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.2/fpm/Dockerfile) +* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/7.2/fpm/Dockerfile) ## Overview @@ -168,7 +168,7 @@ $ for ext in `ls /usr/src/php/ext`; do echo '*' $( php -r "if(extension_loaded(' * https://sources.debian.org/src/php7.4/7.4.33-1+deb11u1/debian/control/ -* https://sources.debian.org/src/php8.1/8.2.10-1/debian/control/ +* https://sources.debian.org/src/php8.1/8.2.13-1/debian/control/ * https://ram.tianon.xyz/post/2017/12/26/dockerize-compiled-software.html diff --git a/dockerfile/php/nightly/cli/Dockerfile b/dockerfile/php/nightly/cli/Dockerfile index 2621a1551..44acbc91f 100644 --- a/dockerfile/php/nightly/cli/Dockerfile +++ b/dockerfile/php/nightly/cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -FROM --platform=$TARGETPLATFORM alpine:3.18 +FROM --platform=$TARGETPLATFORM alpine:3.19 LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/nightly/fpm/Dockerfile b/dockerfile/php/nightly/fpm/Dockerfile index 068a1b7c3..478a5829c 100644 --- a/dockerfile/php/nightly/fpm/Dockerfile +++ b/dockerfile/php/nightly/fpm/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -FROM --platform=$TARGETPLATFORM alpine:3.18 as php +FROM --platform=$TARGETPLATFORM alpine:3.19 as php LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/php/php-cs-fixer/Dockerfile b/dockerfile/php/php-cs-fixer/Dockerfile index 8a72f7389..9b4406fef 100644 --- a/dockerfile/php/php-cs-fixer/Dockerfile +++ b/dockerfile/php/php-cs-fixer/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:labs -ARG PHP_VERSION=8.1.23 +ARG PHP_VERSION=8.1.26 ARG USERNAME=khs1994 ARG BASE=composer diff --git a/dockerfile/php/phploc/Dockerfile b/dockerfile/php/phploc/Dockerfile index 18a53f1f2..45c055501 100644 --- a/dockerfile/php/phploc/Dockerfile +++ b/dockerfile/php/phploc/Dockerfile @@ -4,7 +4,7 @@ ARG PHP_VERSION=7.4.33 ARG USERNAME=khs1994 ARG BASE=composer -FROM alpine:3.17 as phploc-downloader +FROM alpine:3.19 as phploc-downloader # Copy/Paste Detector (CPD) for PHP code. https://github.com/sebastianbergmann/phploc diff --git a/dockerfile/php/sync/docker-image-sync.json b/dockerfile/php/sync/docker-image-sync.json index 795568e21..715a31ef5 100644 --- a/dockerfile/php/sync/docker-image-sync.json +++ b/dockerfile/php/sync/docker-image-sync.json @@ -1,39 +1,39 @@ [ { - "source": "php:8.2.10-cli-alpine" + "source": "php:8.2.13-cli-alpine" }, { - "source": "php:8.2.10-fpm-alpine" + "source": "php:8.2.13-fpm-alpine" }, { - "source": "php:8.2.10-unit-alpine" + "source": "php:8.2.13-unit-alpine" }, { - "source": "php:8.2.10-composer-alpine" + "source": "php:8.2.13-composer-alpine" }, { - "source": "php:8.2.10-swoole-alpine" + "source": "php:8.2.13-swoole-alpine" }, { - "source": "php:8.2.10-s6-alpine" + "source": "php:8.2.13-s6-alpine" }, { - "source": "php:8.1.23-cli-alpine" + "source": "php:8.1.26-cli-alpine" }, { - "source": "php:8.1.23-fpm-alpine" + "source": "php:8.1.26-fpm-alpine" }, { - "source": "php:8.1.23-unit-alpine" + "source": "php:8.1.26-unit-alpine" }, { - "source": "php:8.1.23-composer-alpine" + "source": "php:8.1.26-composer-alpine" }, { - "source": "php:8.1.23-swoole-alpine" + "source": "php:8.1.26-swoole-alpine" }, { - "source": "php:8.1.23-s6-alpine" + "source": "php:8.1.26-s6-alpine" }, { "source": "php:8.0.30-cli-alpine" diff --git a/dockerfile/php/sync/manifest.txt b/dockerfile/php/sync/manifest.txt index 3d477ed62..2df0e95ab 100644 --- a/dockerfile/php/sync/manifest.txt +++ b/dockerfile/php/sync/manifest.txt @@ -1,15 +1,15 @@ -8.2.10-cli-alpine -8.2.10-fpm-alpine -8.2.10-unit-alpine -8.2.10-composer-alpine -8.2.10-swoole-alpine -8.2.10-s6-alpine -8.1.23-cli-alpine -8.1.23-fpm-alpine -8.1.23-unit-alpine -8.1.23-composer-alpine -8.1.23-swoole-alpine -8.1.23-s6-alpine +8.2.13-cli-alpine +8.2.13-fpm-alpine +8.2.13-unit-alpine +8.2.13-composer-alpine +8.2.13-swoole-alpine +8.2.13-s6-alpine +8.1.26-cli-alpine +8.1.26-fpm-alpine +8.1.26-unit-alpine +8.1.26-composer-alpine +8.1.26-swoole-alpine +8.1.26-s6-alpine 8.0.30-cli-alpine 8.0.30-fpm-alpine 8.0.30-unit-alpine diff --git a/dockerfile/php/tests/git/Dockerfile b/dockerfile/php/tests/git/Dockerfile index b0b411600..c5a4c5e04 100644 --- a/dockerfile/php/tests/git/Dockerfile +++ b/dockerfile/php/tests/git/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache git \ openssh-client \ diff --git a/dockerfile/sync/docker-image-sync.json b/dockerfile/sync/docker-image-sync.json index 233ae788d..f79208ff4 100644 --- a/dockerfile/sync/docker-image-sync.json +++ b/dockerfile/sync/docker-image-sync.json @@ -39,21 +39,21 @@ "source": "docker:test-dind-rootless", "dest": "library-mirror/docker:test-dind-rootless" }, - { - "source": "library/alpine:3.15", - "dest": "library-mirror/alpine:3.15" - }, { "source": "library/alpine:3.16", "dest": "library-mirror/alpine:3.16" }, { "source": "library/alpine:3.17", - "dest": "library-mirror/alpine:3.16" + "dest": "library-mirror/alpine:3.17" }, { "source": "library/alpine:3.18", - "dest": "library-mirror/alpine:3.16" + "dest": "library-mirror/alpine:3.18" + }, + { + "source": "library/alpine:3.19", + "dest": "library-mirror/alpine:3.19" }, { "source": "library/alpine:edge", diff --git a/docs/custom.md b/docs/custom.md index 94b04047f..642e4488d 100644 --- a/docs/custom.md +++ b/docs/custom.md @@ -37,7 +37,7 @@ services: php8: # 想修改哪个配置在这里重写即可，例如想使用自己的 PHP 镜像或国内镜像，那么增加 `image` 指令即可 - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.10}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-fpm-alpine ``` 你也可以加上 `build` 字段，先构建镜像再启动 @@ -48,7 +48,7 @@ services: services: php8: - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.10}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-fpm-alpine # 增加 build 字段 build: context: ./dockerfile/php/ diff --git a/kubernetes/lnmp/php/base/lnmp-php.yaml b/kubernetes/lnmp/php/base/lnmp-php.yaml index 83f15495f..434218096 100644 --- a/kubernetes/lnmp/php/base/lnmp-php.yaml +++ b/kubernetes/lnmp/php/base/lnmp-php.yaml @@ -44,7 +44,7 @@ spec: kubernetes.io/os: linux containers: - name: lnmp-php - image: khs1994/php:8.2.10-fpm-alpine + image: khs1994/php:8.2.13-fpm-alpine imagePullPolicy: IfNotPresent args: - php-fpm diff --git a/lrew/nginx-unit/docker-compose.yml b/lrew/nginx-unit/docker-compose.yml index e85ea4107..24ed71454 100644 --- a/lrew/nginx-unit/docker-compose.yml +++ b/lrew/nginx-unit/docker-compose.yml @@ -20,7 +20,7 @@ services: << : - *common - *common-label - image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.10}-unit-alpine" + image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-unit-alpine" volumes: - ./config/${LNMP_NGINX_UNIT_CONF:-nginx-unit}:/etc/nginx-unit # ./path/unit-init-conf:/docker-entrypoint.d diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index 326123032..e84dc88e4 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -12,7 +12,7 @@ services: image: memcached:1.6.15-alpine php: - image: php:8.2.10-fpm-alpine + image: php:8.2.13-fpm-alpine composer: image: composer:2.5.8 diff --git a/vscode-remote/docker-workspace.yml b/vscode-remote/docker-workspace.yml index 54ce21e1e..e0b80d3d3 100644 --- a/vscode-remote/docker-workspace.yml +++ b/vscode-remote/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.10-composer-alpine + image: khs1994/php:8.2.13-composer-alpine networks: - backend volumes: @@ -68,7 +68,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.10-composer-alpine" + image: "khs1994/php:8.2.13-composer-alpine" command: [] # install | update npm: diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.json b/windows/lnmp-windows-pm-repo/php/lwpm.json index d4c28c28c..4d6f90c33 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php/lwpm.json @@ -10,7 +10,7 @@ "C:\\php", "C:\\php-pre" ], - "pre-version": "8.2.10", + "pre-version": "8.2.13", "releases": "https://www.php.net/downloads.php", "scripts": { "get-version": "if(!($VERSION)){\n$VERSION=$stable_version\n}\nif($isPre){\n$VC_VERSION=\"nts-Win32-vs16\"\n$VERSION=$pre_version\n$url=\"https://windows.php.net/downloads/qa/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/qa/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php-pre\"\n$global:PHP_PREFIX=\"C:\\php-pre\"\n}else{\n$VC_VERSION=\"nts-Win32-vs16\"\n$url=\"https://windows.php.net/downloads/releases/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/releases/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php\"\n$global:PHP_PREFIX=\"C:\\php\"\n}", @@ -32,5 +32,5 @@ "uninstall": "if($isPre -eq 1){_cleanup \"C:\\php-pre\"}else{_cleanup \"C:\\php\"}\n", "version": "(php -v).split(\" \")[1]" }, - "version": "8.2.10" + "version": "8.2.13" } diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.yaml b/windows/lnmp-windows-pm-repo/php/lwpm.yaml index d6e4496a2..0897440a8 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php/lwpm.yaml @@ -1,7 +1,7 @@ name: "php" description: "PHP is a popular general-purpose scripting language that is especially suited to web development" -version: "8.2.10" -pre-version: "8.2.10" +version: "8.2.13" +pre-version: "8.2.13" homepage: "https://www.php.net/" bug: "https://www.php.net/" github: "php/php-src" diff --git a/wsl/.env b/wsl/.env index 9c7463d5a..2973d0616 100644 --- a/wsl/.env +++ b/wsl/.env @@ -3,7 +3,7 @@ PHP_VERSION_72=7.2.34 PHP_VERSION_73=7.3.33 PHP_VERSION_74=7.4.33 PHP_VERSION_80=8.0.30 -PHP_VERSION_81=8.1.23 -PHP_VERSION_82=8.2.10 +PHP_VERSION_81=8.1.26 +PHP_VERSION_82=8.2.13 registry=docker.io diff --git a/wsl/Dockerfile b/wsl/Dockerfile index 549cdcdba..837711c2a 100755 --- a/wsl/Dockerfile +++ b/wsl/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim ################################################################################ -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 ARG PHP_NUM=82 diff --git a/wsl/docker-compose.yml b/wsl/docker-compose.yml index 6b42b5bcd..b27a640f4 100755 --- a/wsl/docker-compose.yml +++ b/wsl/docker-compose.yml @@ -33,11 +33,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.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-php81_${PHP_VERSION_81:-8.1.23}-debian-bullseye_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-debian-bullseye_amd64 wsl-php-builder-nightly: build: @@ -56,11 +56,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=debian:bookworm-slim - DEB_URL=mirrors.ustc.edu.cn - DEB_SECURITY_URL=mirrors.ustc.edu.cn/debian-security - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-debian-bookworm_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-debian-bookworm_amd64 # https://endoflife.software/operating-systems/linux/ubuntu # https://github.com/docker-library/docs/tree/master/ubuntu @@ -91,11 +91,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.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-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-bionic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-ubuntu-bionic_amd64 wsl-php-builder-ubuntu2004-74: build: @@ -124,11 +124,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.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-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-focal_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-ubuntu-focal_amd64 wsl-php-builder-ubuntu2204-74: build: @@ -157,11 +157,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.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-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-jammy_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-ubuntu-jammy_amd64 wsl-php-builder-ubuntu2204-nightly: build: @@ -180,11 +180,11 @@ services: context: . dockerfile: wsl.phpbuilder.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=ubuntu:22.10 # - UBUNTU_URL=mirrors.ustc.edu.cn # - UBUNTU_SECURITY_URL=mirrors.ustc.edu.cn - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-ubuntu-kinetic_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-ubuntu-kinetic_amd64 # rhel @@ -219,9 +219,9 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=quay.io/centos/centos:stream8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-centos-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-centos-8_amd64 wsl-php-builder-rhel9-74: build: @@ -246,9 +246,9 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=quay.io/centos/centos:stream9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-centos-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-centos-9_amd64 # https://github.com/docker-library/docs/tree/master/rockylinux @@ -257,18 +257,18 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=rockylinux:8 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-rocky-8_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-rocky-8_amd64 wsl-php-builder-rocky9-81: build: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=rockylinux:9 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-rocky-9_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-rocky-9_amd64 # fedora # https://github.com/docker-library/docs/tree/master/fedora @@ -296,9 +296,9 @@ services: context: . dockerfile: wsl.phpbuilder.rhel.Dockerfile args: - - PHP_VERSION=${PHP_VERSION_81:-8.1.23} + - PHP_VERSION=${PHP_VERSION_81:-8.1.26} - OS_TYPE=fedora:36 - image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.23}-fedora-36_amd64 + image: ${registry:-docker.io}/khs1994/wsl:khs1994-wsl-php81_${PHP_VERSION_81:-8.1.26}-fedora-36_amd64 wsl-php-builder-fc36-nightly: build: diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index cb3a38def..2b7af4306 100755 --- a/wsl/lnmp-wsl-builder-php +++ b/wsl/lnmp-wsl-builder-php @@ -66,7 +66,7 @@ export TZ=Asia/Shanghai # export CC=clang CXX=clang export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.10 +export PHP_LATEST_VERSION=8.2.13 ################################################################################ for command in "$@" diff --git a/wsl/lnmp-wsl-builder-php-rhel b/wsl/lnmp-wsl-builder-php-rhel index a83b19a16..cf1f3aec3 100755 --- a/wsl/lnmp-wsl-builder-php-rhel +++ b/wsl/lnmp-wsl-builder-php-rhel @@ -56,7 +56,7 @@ export TZ=Asia/Shanghai # export CC=clang CXX=clang # export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.10 +export PHP_LATEST_VERSION=8.2.13 ################################################################################ # diff --git a/wsl/wsl.phpbuilder.Dockerfile b/wsl/wsl.phpbuilder.Dockerfile index 394efdc2e..50a772dea 100755 --- a/wsl/wsl.phpbuilder.Dockerfile +++ b/wsl/wsl.phpbuilder.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 COPY lnmp-wsl-builder-php /lnmp-wsl-builder-php.sh diff --git a/wsl/wsl.phpbuilder.rhel.Dockerfile b/wsl/wsl.phpbuilder.rhel.Dockerfile index d747e9cfe..f315a62b8 100755 --- a/wsl/wsl.phpbuilder.rhel.Dockerfile +++ b/wsl/wsl.phpbuilder.rhel.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.10 +ARG PHP_VERSION=8.2.13 COPY lnmp-wsl-builder-php-rhel /lnmp-wsl-builder-php-rhel.sh From fc1af3751f6f21b2265035d63340ac2647801544 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 17 Feb 2024 17:23:34 +0800 Subject: [PATCH 35/42] [Kubernetes] Update cli help info v1.28.0 Signed-off-by: Kang Huaishuai --- kubernetes/cli/cri-containerd.txt | 16 +-- kubernetes/cli/docker.txt | 4 +- kubernetes/cli/etcd.txt | 10 +- kubernetes/cli/kube-apiserver.txt | 65 ++++++----- kubernetes/cli/kube-controller-manager.txt | 130 ++++++++++++--------- kubernetes/cli/kube-proxy.txt | 55 +++++---- kubernetes/cli/kube-scheduler.txt | 54 ++++----- kubernetes/cli/kubelet.txt | 62 +++++----- kubernetes/cli/runc.txt | 6 +- 9 files changed, 218 insertions(+), 184 deletions(-) diff --git a/kubernetes/cli/cri-containerd.txt b/kubernetes/cli/cri-containerd.txt index c19fc5850..b6c04a31e 100644 --- a/kubernetes/cli/cri-containerd.txt +++ b/kubernetes/cli/cri-containerd.txt @@ -13,12 +13,12 @@ USAGE: cri-containerd [global options] command [command options] [arguments...] VERSION: - v1.6.8 + v1.7.0 DESCRIPTION: containerd is a high performance container runtime whose daemon can be started -by using this command. If none of the *config*, *publish*, or *help* commands +by using this command. If none of the *config*, *publish*, *oci-hook*, or *help* commands are specified, the default action of the **containerd** command is to start the containerd daemon in the foreground. @@ -29,15 +29,15 @@ generate the default configuration for containerd. The output of that command can be used and modified as necessary as a custom configuration. COMMANDS: - config information on the containerd config - publish binary to publish events to containerd - oci-hook provides a base for OCI runtime hooks to allow arguments to be injected. + config Information on the containerd config + publish Binary to publish events to containerd + oci-hook Provides a base for OCI runtime hooks to allow arguments to be injected. help, h Shows a list of commands or help for one command GLOBAL OPTIONS: - --config value, -c value path to the configuration file (default: "/etc/containerd/config.toml") - --log-level value, -l value set the logging level [trace, debug, info, warn, error, fatal, panic] - --address value, -a value address for containerd's GRPC server + --config value, -c value Path to the configuration file (default: "/etc/containerd/config.toml") + --log-level value, -l value Set the logging level [trace, debug, info, warn, error, fatal, panic] + --address value, -a value Address for containerd's GRPC server --root value containerd root directory --state value containerd state directory --help, -h show help diff --git a/kubernetes/cli/docker.txt b/kubernetes/cli/docker.txt index 93d96ba94..f4a50b3f6 100644 --- a/kubernetes/cli/docker.txt +++ b/kubernetes/cli/docker.txt @@ -27,9 +27,9 @@ Options: Management Commands: app* Docker App (Docker Inc., v0.9.1-beta3) builder Manage builds - buildx* Docker Buildx (Docker Inc., v0.10.4-docker) + buildx* Docker Buildx (Docker Inc., v0.11.2) checkpoint Manage checkpoints - compose* Docker Compose (Docker Inc., v2.17.2) + compose* Docker Compose (Docker Inc., v2.21.0) config Manage Docker configs container Manage containers context Manage contexts diff --git a/kubernetes/cli/etcd.txt b/kubernetes/cli/etcd.txt index 0d93c35b3..542e46395 100644 --- a/kubernetes/cli/etcd.txt +++ b/kubernetes/cli/etcd.txt @@ -37,7 +37,9 @@ Member: --listen-peer-urls 'http://localhost:2380' List of URLs to listen on for peer traffic. --listen-client-urls 'http://localhost:2379' - List of URLs to listen on for client traffic. + List of URLs to listen on for client grpc traffic and http as long as --listen-client-http-urls is not specified. + --listen-client-http-urls '' + List of URLs to listen on for http only client traffic. Enabling this flag removes http services from --listen-client-urls. --max-snapshots '5' Maximum number of snapshot files to retain (0 is unlimited). --max-wals '5' @@ -54,6 +56,8 @@ Member: Maximum number of operations permitted in a transaction. --max-request-bytes '1572864' Maximum client request size in bytes the server will accept. + --max-concurrent-streams 'math.MaxUint32' + Maximum concurrent streams that each client can open at a time. --grpc-keepalive-min-time '5s' Minimum duration interval that a client should wait before pinging server. --grpc-keepalive-interval '2h' @@ -146,6 +150,10 @@ Security: Comma-separated whitelist of origins for CORS, or cross-origin resource sharing, (empty or * means allow all). --host-whitelist '*' Acceptable hostnames from HTTP client requests, if server is not secure (empty or * means allow all). + --tls-min-version 'TLS1.2' + Minimum TLS version supported by etcd. Possible values: TLS1.2, TLS1.3. + --tls-max-version '' + Maximum TLS version supported by etcd. Possible values: TLS1.2, TLS1.3 (empty will be auto-populated by Go). Auth: --auth-token 'simple' diff --git a/kubernetes/cli/kube-apiserver.txt b/kubernetes/cli/kube-apiserver.txt index d5f427156..81d1e29f2 100644 --- a/kubernetes/cli/kube-apiserver.txt +++ b/kubernetes/cli/kube-apiserver.txt @@ -19,10 +19,9 @@ Generic flags: APIListChunking=true|false (BETA - default=true) APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) - APISelfSubjectReview=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) APIServerTracing=true|false (BETA - default=true) - AdmissionWebhookMatchConditions=true|false (ALPHA - default=false) + AdmissionWebhookMatchConditions=true|false (BETA - default=true) AggregatedDiscoveryEndpoint=true|false (BETA - default=true) AllAlpha=true|false (ALPHA - default=false) AllBeta=true|false (BETA - default=false) @@ -31,32 +30,32 @@ Generic flags: CPUManagerPolicyAlphaOptions=true|false (ALPHA - default=false) CPUManagerPolicyBetaOptions=true|false (BETA - default=true) CPUManagerPolicyOptions=true|false (BETA - default=true) + CRDValidationRatcheting=true|false (ALPHA - default=false) CSIMigrationPortworx=true|false (BETA - default=false) - CSIMigrationRBD=true|false (ALPHA - default=false) CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) CloudControllerManagerWebhook=true|false (ALPHA - default=false) CloudDualStackNodeIPs=true|false (ALPHA - default=false) ClusterTrustBundle=true|false (ALPHA - default=false) ComponentSLIs=true|false (BETA - default=true) + ConsistentListFromCache=true|false (ALPHA - default=false) ContainerCheckpoint=true|false (ALPHA - default=false) ContextualLogging=true|false (ALPHA - default=false) + CronJobsScheduledAnnotation=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) CustomResourceValidationExpressions=true|false (BETA - default=true) + DevicePluginCDIDevices=true|false (ALPHA - default=false) DisableCloudProviders=true|false (ALPHA - default=false) DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) DynamicResourceAllocation=true|false (ALPHA - default=false) ElasticIndexedJob=true|false (BETA - default=true) EventedPLEG=true|false (BETA - default=false) - ExpandedDNSConfig=true|false (BETA - default=true) - ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) GracefulNodeShutdown=true|false (BETA - default=true) GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) - IPTablesOwnershipCleanup=true|false (BETA - default=true) InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) @@ -64,18 +63,20 @@ Generic flags: InTreePluginGCEUnregister=true|false (ALPHA - default=false) InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) InTreePluginPortworxUnregister=true|false (ALPHA - default=false) - InTreePluginRBDUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) + JobBackoffLimitPerIndex=true|false (ALPHA - default=false) JobPodFailurePolicy=true|false (BETA - default=true) + JobPodReplacementPolicy=true|false (ALPHA - default=false) JobReadyPods=true|false (BETA - default=true) KMSv2=true|false (BETA - default=true) + KMSv2KDF=true|false (BETA - default=false) + KubeProxyDrainingTerminatingNodes=true|false (ALPHA - default=false) + KubeletCgroupDriverFromCRI=true|false (ALPHA - default=false) KubeletInUserNamespace=true|false (ALPHA - default=false) - KubeletPodResources=true|false (BETA - default=true) KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) KubeletPodResourcesGet=true|false (ALPHA - default=false) - KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) KubeletTracing=true|false (BETA - default=true) - LegacyServiceAccountTokenTracking=true|false (BETA - default=true) + LegacyServiceAccountTokenCleanUp=true|false (ALPHA - default=false) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) @@ -85,35 +86,35 @@ Generic flags: MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) MinDomainsInPodTopologySpread=true|false (BETA - default=true) - MinimizeIPTablesRestore=true|false (BETA - default=true) MultiCIDRRangeAllocator=true|false (ALPHA - default=false) MultiCIDRServiceAllocator=true|false (ALPHA - default=false) - NetworkPolicyStatus=true|false (ALPHA - default=false) NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) NodeLogQuery=true|false (ALPHA - default=false) - NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) - NodeSwap=true|false (ALPHA - default=false) + NodeSwap=true|false (BETA - default=false) OpenAPIEnums=true|false (BETA - default=true) PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) + PersistentVolumeLastPhaseTransitionTime=true|false (ALPHA - default=false) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) - PodHasNetworkCondition=true|false (ALPHA - default=false) + PodHostIPs=true|false (ALPHA - default=false) + PodIndexLabel=true|false (BETA - default=true) + PodReadyToStartContainersCondition=true|false (ALPHA - default=false) PodSchedulingReadiness=true|false (BETA - default=true) - ProbeTerminationGracePeriod=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) - ProxyTerminatingEndpoints=true|false (BETA - default=true) QOSReserved=true|false (ALPHA - default=false) ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) RemainingItemCount=true|false (BETA - default=true) - RetroactiveDefaultStorageClass=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) SELinuxMountReadWriteOncePod=true|false (BETA - default=true) + SchedulerQueueingHints=true|false (BETA - default=true) SecurityContextDeny=true|false (ALPHA - default=false) - ServiceNodePortStaticSubrange=true|false (ALPHA - default=false) + ServiceNodePortStaticSubrange=true|false (BETA - default=true) + SidecarContainers=true|false (ALPHA - default=false) SizeMemoryBackedVolumes=true|false (BETA - default=true) + SkipReadOnlyValidationGCE=true|false (ALPHA - default=false) StableLoadBalancerNodeSet=true|false (BETA - default=true) StatefulSetAutoDeletePVC=true|false (BETA - default=true) StatefulSetStartOrdinal=true|false (BETA - default=true) @@ -121,10 +122,11 @@ Generic flags: StorageVersionHash=true|false (BETA - default=true) TopologyAwareHints=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) - TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) - TopologyManagerPolicyOptions=true|false (ALPHA - default=false) - UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) - ValidatingAdmissionPolicy=true|false (ALPHA - default=false) + TopologyManagerPolicyBetaOptions=true|false (BETA - default=true) + TopologyManagerPolicyOptions=true|false (BETA - default=true) + UnknownVersionInteroperabilityProxy=true|false (ALPHA - default=false) + UserNamespacesSupport=true|false (ALPHA - default=false) + ValidatingAdmissionPolicy=true|false (BETA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) @@ -166,7 +168,7 @@ Etcd flags: Secure serving flags: - --bind-address ip The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank or an unspecified address (0.0.0.0 or ::), all interfaces will be used. (default 0.0.0.0) + --bind-address ip The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank or an unspecified address (0.0.0.0 or ::), all interfaces and IP address families will be used. (default 0.0.0.0) --cert-dir string The directory where the TLS certs are located. If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "/var/run/kubernetes") --http2-max-streams-per-connection int The limit that the server gives to clients for the maximum number of streams in an HTTP/2 connection. Zero means to use golang's default. --permit-address-sharing If true, SO_REUSEADDR will be used when binding the port. This allows binding to wildcard IPs like 0.0.0.0 and specific IPs in parallel, and it avoids waiting for the kernel to release sockets in TIME_WAIT state. [default=false] @@ -260,11 +262,6 @@ Authorization flags: --authorization-webhook-config-file string File with webhook configuration in kubeconfig format, used with --authorization-mode=Webhook. The API server will query the remote service to determine access on the API server's secure port. --authorization-webhook-version string The API version of the authorization.k8s.io SubjectAccessReview to send to and expect from the webhook. (default "v1beta1") -Cloud provider flags: - - --cloud-config string The path to the cloud provider configuration file. Empty string for no configuration file. - --cloud-provider string The provider for cloud services. Empty string for no provider. - API enablement flags: --runtime-config mapStringString A set of key=value pairs that enable or disable built-in APIs. Supported options are: @@ -320,13 +317,21 @@ Misc flags: --kubelet-timeout duration Timeout for kubelet operations. (default 5s) --kubernetes-service-node-port int If non-zero, the Kubernetes master service (which apiserver creates/maintains) will be of type NodePort, using this as the value of the port. If zero, the Kubernetes master service will be of type ClusterIP. --max-connection-bytes-per-sec int If non-zero, throttle each user connection to this number of bytes/sec. Currently only applies to long-running requests. + --peer-advertise-ip string If set and the UnknownVersionInteroperabilityProxy feature gate is enabled, this IP will be used by peer kube-apiservers to proxy requests to this kube-apiserver when the request cannot be handled by the peer due to version skew between the kube-apiservers. This flag is only used in clusters configured with multiple kube-apiservers for high availability. + --peer-advertise-port string If set and the UnknownVersionInteroperabilityProxy feature gate is enabled, this port will be used by peer kube-apiservers to proxy requests to this kube-apiserver when the request cannot be handled by the peer due to version skew between the kube-apiservers. This flag is only used in clusters configured with multiple kube-apiservers for high availability. + --peer-ca-file string If set and the UnknownVersionInteroperabilityProxy feature gate is enabled, this file will be used to verify serving certificates of peer kube-apiservers. This flag is only used in clusters configured with multiple kube-apiservers for high availability. --proxy-client-cert-file string Client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins. It is expected that this cert includes a signature from the CA in the --requestheader-client-ca-file flag. That CA is published in the 'extension-apiserver-authentication' configmap in the kube-system namespace. Components receiving calls from kube-aggregator should use that CA to perform their half of the mutual TLS verification. --proxy-client-key-file string Private key for the client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins. --service-account-signing-key-file string Path to the file that contains the current private key of the service account token issuer. The issuer will sign issued ID tokens with this private key. --service-cluster-ip-range string A CIDR notation IP range from which to assign service cluster IPs. This must not overlap with any IP ranges assigned to nodes or pods. Max of two dual-stack CIDRs is allowed. --service-node-port-range portRange A port range to reserve for services with NodePort visibility. This must not overlap with the ephemeral port range on nodes. Example: '30000-32767'. Inclusive at both ends of the range. (default 30000-32767) +Cloud provider flags: + + --cloud-config string The path to the cloud provider configuration file. Empty string for no configuration file. + --cloud-provider string The provider for cloud services. Empty string for no provider. + Global flags: -h, --help help for kube-apiserver - --version version[=true] Print version information and quit + --version version[=true] --version, --version=raw prints version information and quits; --version=vX.Y.Z... sets the reported version diff --git a/kubernetes/cli/kube-controller-manager.txt b/kubernetes/cli/kube-controller-manager.txt index 88f9b7b9e..733765204 100644 --- a/kubernetes/cli/kube-controller-manager.txt +++ b/kubernetes/cli/kube-controller-manager.txt @@ -31,17 +31,16 @@ Generic flags: --configure-cloud-routes Should CIDRs allocated by allocate-node-cidrs be configured on the cloud provider. (default true) --controller-start-interval duration Interval between starting controller managers. --controllers strings A list of controllers to enable. '*' enables all on-by-default controllers, 'foo' enables the controller named 'foo', '-foo' disables the controller named 'foo'. - All controllers: attachdetach, bootstrapsigner, cloud-node-lifecycle, clusterrole-aggregation, cronjob, csrapproving, csrcleaner, csrsigning, daemonset, deployment, disruption, endpoint, endpointslice, endpointslicemirroring, ephemeral-volume, garbagecollector, horizontalpodautoscaling, job, namespace, nodeipam, nodelifecycle, persistentvolume-binder, persistentvolume-expander, podgc, pv-protection, pvc-protection, replicaset, replicationcontroller, resourcequota, root-ca-cert-publisher, route, service, serviceaccount, serviceaccount-token, statefulset, tokencleaner, ttl, ttl-after-finished - Disabled-by-default controllers: bootstrapsigner, tokencleaner (default [*]) - --external-cloud-volume-plugin string The plugin to use when cloud provider is set to external. Can be empty, should only be set when cloud-provider is external. Currently used to allow node and volume controllers to work for in tree cloud providers. + All controllers: bootstrap-signer-controller, certificatesigningrequest-approving-controller, certificatesigningrequest-cleaner-controller, certificatesigningrequest-signing-controller, cloud-node-lifecycle-controller, clusterrole-aggregation-controller, cronjob-controller, daemonset-controller, deployment-controller, disruption-controller, endpoints-controller, endpointslice-controller, endpointslice-mirroring-controller, ephemeral-volume-controller, garbage-collector-controller, horizontal-pod-autoscaler-controller, job-controller, namespace-controller, node-ipam-controller, node-lifecycle-controller, node-route-controller, persistentvolume-attach-detach-controller, persistentvolume-binder-controller, persistentvolume-expander-controller, persistentvolume-protection-controller, persistentvolumeclaim-protection-controller, pod-garbage-collector-controller, replicaset-controller, replicationcontroller-controller, resourcequota-controller, root-ca-certificate-publisher-controller, service-lb-controller, serviceaccount-controller, serviceaccount-token-controller, statefulset-controller, token-cleaner-controller, ttl-after-finished-controller, ttl-controller + Disabled-by-default controllers: bootstrap-signer-controller, token-cleaner-controller (default [*]) + --external-cloud-volume-plugin string The plugin to use when cloud provider is set to external. Can be empty, should only be set when cloud-provider is external. Currently used to allow node-ipam-controller, persistentvolume-binder-controller, persistentvolume-expander-controller and attach-detach-controller to work for in tree cloud providers. --feature-gates mapStringBool A set of key=value pairs that describe feature gates for alpha/experimental features. Options are: APIListChunking=true|false (BETA - default=true) APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) - APISelfSubjectReview=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) APIServerTracing=true|false (BETA - default=true) - AdmissionWebhookMatchConditions=true|false (ALPHA - default=false) + AdmissionWebhookMatchConditions=true|false (BETA - default=true) AggregatedDiscoveryEndpoint=true|false (BETA - default=true) AllAlpha=true|false (ALPHA - default=false) AllBeta=true|false (BETA - default=false) @@ -50,32 +49,32 @@ Generic flags: CPUManagerPolicyAlphaOptions=true|false (ALPHA - default=false) CPUManagerPolicyBetaOptions=true|false (BETA - default=true) CPUManagerPolicyOptions=true|false (BETA - default=true) + CRDValidationRatcheting=true|false (ALPHA - default=false) CSIMigrationPortworx=true|false (BETA - default=false) - CSIMigrationRBD=true|false (ALPHA - default=false) CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) CloudControllerManagerWebhook=true|false (ALPHA - default=false) CloudDualStackNodeIPs=true|false (ALPHA - default=false) ClusterTrustBundle=true|false (ALPHA - default=false) ComponentSLIs=true|false (BETA - default=true) + ConsistentListFromCache=true|false (ALPHA - default=false) ContainerCheckpoint=true|false (ALPHA - default=false) ContextualLogging=true|false (ALPHA - default=false) + CronJobsScheduledAnnotation=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) CustomResourceValidationExpressions=true|false (BETA - default=true) + DevicePluginCDIDevices=true|false (ALPHA - default=false) DisableCloudProviders=true|false (ALPHA - default=false) DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) DynamicResourceAllocation=true|false (ALPHA - default=false) ElasticIndexedJob=true|false (BETA - default=true) EventedPLEG=true|false (BETA - default=false) - ExpandedDNSConfig=true|false (BETA - default=true) - ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) GracefulNodeShutdown=true|false (BETA - default=true) GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) - IPTablesOwnershipCleanup=true|false (BETA - default=true) InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) @@ -83,18 +82,20 @@ Generic flags: InTreePluginGCEUnregister=true|false (ALPHA - default=false) InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) InTreePluginPortworxUnregister=true|false (ALPHA - default=false) - InTreePluginRBDUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) + JobBackoffLimitPerIndex=true|false (ALPHA - default=false) JobPodFailurePolicy=true|false (BETA - default=true) + JobPodReplacementPolicy=true|false (ALPHA - default=false) JobReadyPods=true|false (BETA - default=true) KMSv2=true|false (BETA - default=true) + KMSv2KDF=true|false (BETA - default=false) + KubeProxyDrainingTerminatingNodes=true|false (ALPHA - default=false) + KubeletCgroupDriverFromCRI=true|false (ALPHA - default=false) KubeletInUserNamespace=true|false (ALPHA - default=false) - KubeletPodResources=true|false (BETA - default=true) KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) KubeletPodResourcesGet=true|false (ALPHA - default=false) - KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) KubeletTracing=true|false (BETA - default=true) - LegacyServiceAccountTokenTracking=true|false (BETA - default=true) + LegacyServiceAccountTokenCleanUp=true|false (ALPHA - default=false) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) @@ -104,35 +105,35 @@ Generic flags: MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) MinDomainsInPodTopologySpread=true|false (BETA - default=true) - MinimizeIPTablesRestore=true|false (BETA - default=true) MultiCIDRRangeAllocator=true|false (ALPHA - default=false) MultiCIDRServiceAllocator=true|false (ALPHA - default=false) - NetworkPolicyStatus=true|false (ALPHA - default=false) NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) NodeLogQuery=true|false (ALPHA - default=false) - NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) - NodeSwap=true|false (ALPHA - default=false) + NodeSwap=true|false (BETA - default=false) OpenAPIEnums=true|false (BETA - default=true) PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) + PersistentVolumeLastPhaseTransitionTime=true|false (ALPHA - default=false) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) - PodHasNetworkCondition=true|false (ALPHA - default=false) + PodHostIPs=true|false (ALPHA - default=false) + PodIndexLabel=true|false (BETA - default=true) + PodReadyToStartContainersCondition=true|false (ALPHA - default=false) PodSchedulingReadiness=true|false (BETA - default=true) - ProbeTerminationGracePeriod=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) - ProxyTerminatingEndpoints=true|false (BETA - default=true) QOSReserved=true|false (ALPHA - default=false) ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) RemainingItemCount=true|false (BETA - default=true) - RetroactiveDefaultStorageClass=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) SELinuxMountReadWriteOncePod=true|false (BETA - default=true) + SchedulerQueueingHints=true|false (BETA - default=true) SecurityContextDeny=true|false (ALPHA - default=false) - ServiceNodePortStaticSubrange=true|false (ALPHA - default=false) + ServiceNodePortStaticSubrange=true|false (BETA - default=true) + SidecarContainers=true|false (ALPHA - default=false) SizeMemoryBackedVolumes=true|false (BETA - default=true) + SkipReadOnlyValidationGCE=true|false (ALPHA - default=false) StableLoadBalancerNodeSet=true|false (BETA - default=true) StatefulSetAutoDeletePVC=true|false (BETA - default=true) StatefulSetStartOrdinal=true|false (BETA - default=true) @@ -140,10 +141,11 @@ Generic flags: StorageVersionHash=true|false (BETA - default=true) TopologyAwareHints=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) - TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) - TopologyManagerPolicyOptions=true|false (ALPHA - default=false) - UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) - ValidatingAdmissionPolicy=true|false (ALPHA - default=false) + TopologyManagerPolicyBetaOptions=true|false (BETA - default=true) + TopologyManagerPolicyOptions=true|false (BETA - default=true) + UnknownVersionInteroperabilityProxy=true|false (ALPHA - default=false) + UserNamespacesSupport=true|false (ALPHA - default=false) + ValidatingAdmissionPolicy=true|false (BETA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) @@ -160,17 +162,17 @@ Generic flags: --leader-elect-resource-namespace string The namespace of resource object that is used for locking during leader election. (default "kube-system") --leader-elect-retry-period duration The duration the clients should wait between attempting acquisition and renewal of a leadership. This is only applicable if leader election is enabled. (default 2s) --min-resync-period duration The resync period in reflectors will be random between MinResyncPeriod and 2*MinResyncPeriod. (default 12h0m0s) - --node-monitor-period duration The period for syncing NodeStatus in NodeController. (default 5s) + --node-monitor-period duration The period for syncing NodeStatus in cloud-node-lifecycle-controller. (default 5s) --route-reconciliation-period duration The period for reconciling routes created for Nodes by cloud provider. (default 10s) --use-service-account-credentials If true, use individual service account credentials for each controller. -Service controller flags: +Service-lb-controller flags: --concurrent-service-syncs int32 The number of services that are allowed to sync concurrently. Larger number = more responsive service management, but more CPU (and network) load (default 1) Secure serving flags: - --bind-address ip The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank or an unspecified address (0.0.0.0 or ::), all interfaces will be used. (default 0.0.0.0) + --bind-address ip The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank or an unspecified address (0.0.0.0 or ::), all interfaces and IP address families will be used. (default 0.0.0.0) --cert-dir string The directory where the TLS certs are located. If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. --http2-max-streams-per-connection int The limit that the server gives to clients for the maximum number of streams in an HTTP/2 connection. Zero means to use golang's default. --permit-address-sharing If true, SO_REUSEADDR will be used when binding the port. This allows binding to wildcard IPs like 0.0.0.0 and specific IPs in parallel, and it avoids waiting for the kernel to release sockets in TIME_WAIT state. [default=false] @@ -204,12 +206,12 @@ Authorization flags: --authorization-webhook-cache-authorized-ttl duration The duration to cache 'authorized' responses from the webhook authorizer. (default 10s) --authorization-webhook-cache-unauthorized-ttl duration The duration to cache 'unauthorized' responses from the webhook authorizer. (default 10s) -Attachdetach controller flags: +Persistentvolume-attach-detach-controller flags: --attach-detach-reconcile-sync-period duration The reconciler sync wait time between volume attach detach. This duration must be larger than one second, and increasing this value from the default may allow for volumes to be mismatched with pods. (default 1m0s) --disable-attach-detach-reconcile-sync Disable volume attach detach reconciler sync. Disabling this may cause volumes to be mismatched with pods. Use wisely. -Csrsigning controller flags: +Certificatesigningrequest-signing-controller flags: --cluster-signing-cert-file string Filename containing a PEM-encoded X509 CA certificate used to issue cluster-scoped certificates. If specified, no more specific --cluster-signing-* flag may be specified. --cluster-signing-duration duration The max length of duration signed certificates will be given. Individual CSRs may request shorter certs by setting spec.expirationSeconds. (default 8760h0m0s) @@ -223,41 +225,41 @@ Csrsigning controller flags: --cluster-signing-legacy-unknown-cert-file string Filename containing a PEM-encoded X509 CA certificate used to issue certificates for the kubernetes.io/legacy-unknown signer. If specified, --cluster-signing-{cert,key}-file must not be set. --cluster-signing-legacy-unknown-key-file string Filename containing a PEM-encoded RSA or ECDSA private key used to sign certificates for the kubernetes.io/legacy-unknown signer. If specified, --cluster-signing-{cert,key}-file must not be set. -Deployment controller flags: +Deployment-controller flags: --concurrent-deployment-syncs int32 The number of deployment objects that are allowed to sync concurrently. Larger number = more responsive deployments, but more CPU (and network) load (default 5) -Statefulset controller flags: +Statefulset-controller flags: --concurrent-statefulset-syncs int32 The number of statefulset objects that are allowed to sync concurrently. Larger number = more responsive statefulsets, but more CPU (and network) load (default 5) -Endpoint controller flags: +Endpoints-controller flags: --concurrent-endpoint-syncs int32 The number of endpoint syncing operations that will be done concurrently. Larger number = faster endpoint updating, but more CPU (and network) load (default 5) --endpoint-updates-batch-period duration The length of endpoint updates batching period. Processing of pod changes will be delayed by this duration to join them with potential upcoming updates and reduce the overall number of endpoints updates. Larger number = higher endpoint programming latency, but lower number of endpoints revision generated -Endpointslice controller flags: +Endpointslice-controller flags: --concurrent-service-endpoint-syncs int32 The number of service endpoint syncing operations that will be done concurrently. Larger number = faster endpoint slice updating, but more CPU (and network) load. Defaults to 5. (default 5) --endpointslice-updates-batch-period duration The length of endpoint slice updates batching period. Processing of pod changes will be delayed by this duration to join them with potential upcoming updates and reduce the overall number of endpoints updates. Larger number = higher endpoint programming latency, but lower number of endpoints revision generated --max-endpoints-per-slice int32 The maximum number of endpoints that will be added to an EndpointSlice. More endpoints per slice will result in less endpoint slices, but larger resources. Defaults to 100. (default 100) -Endpointslicemirroring controller flags: +Endpointslice-mirroring-controller flags: - --mirroring-concurrent-service-endpoint-syncs int32 The number of service endpoint syncing operations that will be done concurrently by the EndpointSliceMirroring controller. Larger number = faster endpoint slice updating, but more CPU (and network) load. Defaults to 5. (default 5) - --mirroring-endpointslice-updates-batch-period duration The length of EndpointSlice updates batching period for EndpointSliceMirroring controller. Processing of EndpointSlice changes will be delayed by this duration to join them with potential upcoming updates and reduce the overall number of EndpointSlice updates. Larger number = higher endpoint programming latency, but lower number of endpoints revision generated - --mirroring-max-endpoints-per-subset int32 The maximum number of endpoints that will be added to an EndpointSlice by the EndpointSliceMirroring controller. More endpoints per slice will result in less endpoint slices, but larger resources. Defaults to 100. (default 1000) + --mirroring-concurrent-service-endpoint-syncs int32 The number of service endpoint syncing operations that will be done concurrently by the endpointslice-mirroring-controller. Larger number = faster endpoint slice updating, but more CPU (and network) load. Defaults to 5. (default 5) + --mirroring-endpointslice-updates-batch-period duration The length of EndpointSlice updates batching period for endpointslice-mirroring-controller. Processing of EndpointSlice changes will be delayed by this duration to join them with potential upcoming updates and reduce the overall number of EndpointSlice updates. Larger number = higher endpoint programming latency, but lower number of endpoints revision generated + --mirroring-max-endpoints-per-subset int32 The maximum number of endpoints that will be added to an EndpointSlice by the endpointslice-mirroring-controller. More endpoints per slice will result in less endpoint slices, but larger resources. Defaults to 100. (default 1000) -Ephemeralvolume controller flags: +Ephemeral-volume-controller flags: --concurrent-ephemeralvolume-syncs int32 The number of ephemeral volume syncing operations that will be done concurrently. Larger number = faster ephemeral volume updating, but more CPU (and network) load (default 5) -Garbagecollector controller flags: +Garbage-collector-controller flags: --concurrent-gc-syncs int32 The number of garbage collector workers that are allowed to sync concurrently. (default 20) --enable-garbage-collector Enables the generic garbage collector. MUST be synced with the corresponding flag of the kube-apiserver. (default true) -Horizontalpodautoscaling controller flags: +Horizontal-pod-autoscaler-controller flags: --concurrent-horizontal-pod-autoscaler-syncs int32 The number of horizontal pod autoscaler objects that are allowed to sync concurrently. Larger number = more responsive horizontal pod autoscaler objects processing, but more CPU (and network) load. (default 5) --horizontal-pod-autoscaler-cpu-initialization-period duration The period after pod start when CPU samples might be skipped. (default 5m0s) @@ -266,28 +268,40 @@ Horizontalpodautoscaling controller flags: --horizontal-pod-autoscaler-sync-period duration The period for syncing the number of pods in horizontal pod autoscaler. (default 15s) --horizontal-pod-autoscaler-tolerance float The minimum change (from 1.0) in the desired-to-actual metrics ratio for the horizontal pod autoscaler to consider scaling. (default 0.1) -Namespace controller flags: +Job-controller flags: + + --concurrent-job-syncs int32 The number of job objects that are allowed to sync concurrently. Larger number = more responsive jobs, but more CPU (and network) load (default 5) + +Cronjob-controller flags: + + --concurrent-cron-job-syncs int32 The number of cron job objects that are allowed to sync concurrently. Larger number = more responsive jobs, but more CPU (and network) load (default 5) + +Legacy-serviceaccount-token-cleaner-controller flags: + + --legacy-service-account-token-clean-up-period duration The period of time since the last usage of an legacy service account token before it can be deleted. (default 8760h0m0s) + +Namespace-controller flags: --concurrent-namespace-syncs int32 The number of namespace objects that are allowed to sync concurrently. Larger number = more responsive namespace termination, but more CPU (and network) load (default 10) --namespace-sync-period duration The period for syncing namespace life-cycle updates (default 5m0s) -Nodeipam controller flags: +Node-ipam-controller flags: --node-cidr-mask-size int32 Mask size for node cidr in cluster. Default is 24 for IPv4 and 64 for IPv6. --node-cidr-mask-size-ipv4 int32 Mask size for IPv4 node cidr in dual-stack cluster. Default is 24. --node-cidr-mask-size-ipv6 int32 Mask size for IPv6 node cidr in dual-stack cluster. Default is 64. --service-cluster-ip-range string CIDR Range for Services in cluster. Requires --allocate-node-cidrs to be true -Nodelifecycle controller flags: +Node-lifecycle-controller flags: - --large-cluster-size-threshold int32 Number of nodes from which NodeController treats the cluster as large for the eviction logic purposes. --secondary-node-eviction-rate is implicitly overridden to 0 for clusters this size or smaller. (default 50) + --large-cluster-size-threshold int32 Number of nodes from which node-lifecycle-controller treats the cluster as large for the eviction logic purposes. --secondary-node-eviction-rate is implicitly overridden to 0 for clusters this size or smaller. (default 50) --node-eviction-rate float32 Number of nodes per second on which pods are deleted in case of node failure when a zone is healthy (see --unhealthy-zone-threshold for definition of healthy/unhealthy). Zone refers to entire cluster in non-multizone clusters. (default 0.1) --node-monitor-grace-period duration Amount of time which we allow running Node to be unresponsive before marking it unhealthy. Must be N times more than kubelet's nodeStatusUpdateFrequency, where N means number of retries allowed for kubelet to post node status. (default 40s) --node-startup-grace-period duration Amount of time which we allow starting Node to be unresponsive before marking it unhealthy. (default 1m0s) --secondary-node-eviction-rate float32 Number of nodes per second on which pods are deleted in case of node failure when a zone is unhealthy (see --unhealthy-zone-threshold for definition of healthy/unhealthy). Zone refers to entire cluster in non-multizone clusters. This value is implicitly overridden to 0 if the cluster size is smaller than --large-cluster-size-threshold. (default 0.01) --unhealthy-zone-threshold float32 Fraction of Nodes in a zone which needs to be not Ready (minimum 3) for zone to be treated as unhealthy. (default 0.55) -Persistentvolume-binder controller flags: +Persistentvolume-binder-controller flags: --enable-dynamic-provisioning Enable dynamic provisioning for environments that support it. (default true) --enable-hostpath-provisioner Enable HostPath PV provisioning when running without a cloud provider. This allows testing and development of provisioning features. HostPath provisioning is not supported in any way, won't work in a multi-node cluster, and should not be used for anything other than testing or development. @@ -299,35 +313,37 @@ Persistentvolume-binder controller flags: --pv-recycler-pod-template-filepath-nfs string The file path to a pod definition used as a template for NFS persistent volume recycling --pv-recycler-timeout-increment-hostpath int32 the increment of time added per Gi to ActiveDeadlineSeconds for a HostPath scrubber pod. This is for development and testing only and will not work in a multi-node cluster. (default 30) --pvclaimbinder-sync-period duration The period for syncing persistent volumes and persistent volume claims (default 15s) - --volume-host-allow-local-loopback If false, deny local loopback IPs in addition to any CIDR ranges in --volume-host-cidr-denylist (default true) - --volume-host-cidr-denylist strings A comma-separated list of CIDR ranges to avoid from volume plugins. -Podgc controller flags: +Pod-garbage-collector-controller flags: --terminated-pod-gc-threshold int32 Number of terminated pods that can exist before the terminated pod garbage collector starts deleting terminated pods. If <= 0, the terminated pod garbage collector is disabled. (default 12500) -Replicaset controller flags: +Replicaset-controller flags: --concurrent-replicaset-syncs int32 The number of replica sets that are allowed to sync concurrently. Larger number = more responsive replica management, but more CPU (and network) load (default 5) -Replicationcontroller flags: +Replicationcontroller-controller flags: --concurrent-rc-syncs int32 The number of replication controllers that are allowed to sync concurrently. Larger number = more responsive replica management, but more CPU (and network) load (default 5) -Resourcequota controller flags: +Resourcequota-controller flags: --concurrent-resource-quota-syncs int32 The number of resource quotas that are allowed to sync concurrently. Larger number = more responsive quota management, but more CPU (and network) load (default 5) --resource-quota-sync-period duration The period for syncing quota usage status in the system (default 5m0s) -Serviceaccount controller flags: +Serviceaccount-controller flags: --concurrent-serviceaccount-token-syncs int32 The number of service account token objects that are allowed to sync concurrently. Larger number = more responsive token generation, but more CPU (and network) load (default 5) --root-ca-file string If set, this root certificate authority will be included in service account's token secret. This must be a valid PEM-encoded CA bundle. --service-account-private-key-file string Filename containing a PEM-encoded private RSA or ECDSA key used to sign service account tokens. -Ttl-after-finished controller flags: +Ttl-after-finished-controller flags: + + --concurrent-ttl-after-finished-syncs int32 The number of ttl-after-finished-controller workers that are allowed to sync concurrently. (default 5) + +Validatingadmissionpolicy-status-controller flags: - --concurrent-ttl-after-finished-syncs int32 The number of TTL-after-finished controller workers that are allowed to sync concurrently. (default 5) + --concurrent-validating-admission-policy-status-syncs int32 The number of ValidatingAdmissionPolicyStatusController workers that are allowed to sync concurrently. (default 5) Metrics flags: @@ -352,4 +368,4 @@ Misc flags: Global flags: -h, --help help for kube-controller-manager - --version version[=true] Print version information and quit + --version version[=true] --version, --version=raw prints version information and quits; --version=vX.Y.Z... sets the reported version diff --git a/kubernetes/cli/kube-proxy.txt b/kubernetes/cli/kube-proxy.txt index c969a2836..ae615ade3 100644 --- a/kubernetes/cli/kube-proxy.txt +++ b/kubernetes/cli/kube-proxy.txt @@ -26,10 +26,9 @@ Flags: APIListChunking=true|false (BETA - default=true) APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) - APISelfSubjectReview=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) APIServerTracing=true|false (BETA - default=true) - AdmissionWebhookMatchConditions=true|false (ALPHA - default=false) + AdmissionWebhookMatchConditions=true|false (BETA - default=true) AggregatedDiscoveryEndpoint=true|false (BETA - default=true) AllAlpha=true|false (ALPHA - default=false) AllBeta=true|false (BETA - default=false) @@ -38,32 +37,32 @@ Flags: CPUManagerPolicyAlphaOptions=true|false (ALPHA - default=false) CPUManagerPolicyBetaOptions=true|false (BETA - default=true) CPUManagerPolicyOptions=true|false (BETA - default=true) + CRDValidationRatcheting=true|false (ALPHA - default=false) CSIMigrationPortworx=true|false (BETA - default=false) - CSIMigrationRBD=true|false (ALPHA - default=false) CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) CloudControllerManagerWebhook=true|false (ALPHA - default=false) CloudDualStackNodeIPs=true|false (ALPHA - default=false) ClusterTrustBundle=true|false (ALPHA - default=false) ComponentSLIs=true|false (BETA - default=true) + ConsistentListFromCache=true|false (ALPHA - default=false) ContainerCheckpoint=true|false (ALPHA - default=false) ContextualLogging=true|false (ALPHA - default=false) + CronJobsScheduledAnnotation=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) CustomResourceValidationExpressions=true|false (BETA - default=true) + DevicePluginCDIDevices=true|false (ALPHA - default=false) DisableCloudProviders=true|false (ALPHA - default=false) DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) DynamicResourceAllocation=true|false (ALPHA - default=false) ElasticIndexedJob=true|false (BETA - default=true) EventedPLEG=true|false (BETA - default=false) - ExpandedDNSConfig=true|false (BETA - default=true) - ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) GracefulNodeShutdown=true|false (BETA - default=true) GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) - IPTablesOwnershipCleanup=true|false (BETA - default=true) InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) @@ -71,18 +70,20 @@ Flags: InTreePluginGCEUnregister=true|false (ALPHA - default=false) InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) InTreePluginPortworxUnregister=true|false (ALPHA - default=false) - InTreePluginRBDUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) + JobBackoffLimitPerIndex=true|false (ALPHA - default=false) JobPodFailurePolicy=true|false (BETA - default=true) + JobPodReplacementPolicy=true|false (ALPHA - default=false) JobReadyPods=true|false (BETA - default=true) KMSv2=true|false (BETA - default=true) + KMSv2KDF=true|false (BETA - default=false) + KubeProxyDrainingTerminatingNodes=true|false (ALPHA - default=false) + KubeletCgroupDriverFromCRI=true|false (ALPHA - default=false) KubeletInUserNamespace=true|false (ALPHA - default=false) - KubeletPodResources=true|false (BETA - default=true) KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) KubeletPodResourcesGet=true|false (ALPHA - default=false) - KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) KubeletTracing=true|false (BETA - default=true) - LegacyServiceAccountTokenTracking=true|false (BETA - default=true) + LegacyServiceAccountTokenCleanUp=true|false (ALPHA - default=false) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) @@ -92,35 +93,35 @@ Flags: MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) MinDomainsInPodTopologySpread=true|false (BETA - default=true) - MinimizeIPTablesRestore=true|false (BETA - default=true) MultiCIDRRangeAllocator=true|false (ALPHA - default=false) MultiCIDRServiceAllocator=true|false (ALPHA - default=false) - NetworkPolicyStatus=true|false (ALPHA - default=false) NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) NodeLogQuery=true|false (ALPHA - default=false) - NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) - NodeSwap=true|false (ALPHA - default=false) + NodeSwap=true|false (BETA - default=false) OpenAPIEnums=true|false (BETA - default=true) PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) + PersistentVolumeLastPhaseTransitionTime=true|false (ALPHA - default=false) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) - PodHasNetworkCondition=true|false (ALPHA - default=false) + PodHostIPs=true|false (ALPHA - default=false) + PodIndexLabel=true|false (BETA - default=true) + PodReadyToStartContainersCondition=true|false (ALPHA - default=false) PodSchedulingReadiness=true|false (BETA - default=true) - ProbeTerminationGracePeriod=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) - ProxyTerminatingEndpoints=true|false (BETA - default=true) QOSReserved=true|false (ALPHA - default=false) ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) RemainingItemCount=true|false (BETA - default=true) - RetroactiveDefaultStorageClass=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) SELinuxMountReadWriteOncePod=true|false (BETA - default=true) + SchedulerQueueingHints=true|false (BETA - default=true) SecurityContextDeny=true|false (ALPHA - default=false) - ServiceNodePortStaticSubrange=true|false (ALPHA - default=false) + ServiceNodePortStaticSubrange=true|false (BETA - default=true) + SidecarContainers=true|false (ALPHA - default=false) SizeMemoryBackedVolumes=true|false (BETA - default=true) + SkipReadOnlyValidationGCE=true|false (ALPHA - default=false) StableLoadBalancerNodeSet=true|false (BETA - default=true) StatefulSetAutoDeletePVC=true|false (BETA - default=true) StatefulSetStartOrdinal=true|false (BETA - default=true) @@ -128,10 +129,11 @@ Flags: StorageVersionHash=true|false (BETA - default=true) TopologyAwareHints=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) - TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) - TopologyManagerPolicyOptions=true|false (ALPHA - default=false) - UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) - ValidatingAdmissionPolicy=true|false (ALPHA - default=false) + TopologyManagerPolicyBetaOptions=true|false (BETA - default=true) + TopologyManagerPolicyOptions=true|false (BETA - default=true) + UnknownVersionInteroperabilityProxy=true|false (ALPHA - default=false) + UserNamespacesSupport=true|false (ALPHA - default=false) + ValidatingAdmissionPolicy=true|false (BETA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) @@ -158,6 +160,9 @@ Flags: --kube-api-qps float32 QPS to use while talking with kubernetes apiserver (default 5) --kubeconfig string Path to kubeconfig file with authorization information (the master location can be overridden by the master flag). --log-flush-frequency duration Maximum number of seconds between log flushes (default 5s) + --log-json-info-buffer-size quantity [Alpha] In JSON format with split output streams, the info messages can be buffered for a while to increase performance. The default value of zero bytes disables buffering. The size can be specified as number of bytes (512), multiples of 1000 (1K), multiples of 1024 (2Ki), or powers of those (3M, 4G, 5Mi, 6Gi). Enable the LoggingAlphaOptions feature gate to use this. + --log-json-split-stream [Alpha] In JSON format, write error messages to stderr and info messages to stdout. The default is to write a single stream to stdout. Enable the LoggingAlphaOptions feature gate to use this. + --logging-format string Sets the log format. Permitted formats: "json" (gated by LoggingBetaOptions), "text". (default "text") --machine-id-file string Comma-separated list of files to check for machine-id. Use the first one that exists. (default "/etc/machine-id,/var/lib/dbus/machine-id") --masquerade-all If using the pure iptables proxy, SNAT all traffic sent via Service cluster IPs (this not commonly needed) --master string The address of the Kubernetes API server (overrides any value in kubeconfig) @@ -171,6 +176,6 @@ Flags: --proxy-port-range port-range Range of host ports (beginPort-endPort, single port or beginPort+offset, inclusive) that may be consumed in order to proxy service traffic. If (unspecified, 0, or 0-0) then ports will be randomly chosen. --show-hidden-metrics-for-version string The previous version for which you want to show hidden metrics. Only the previous minor version is meaningful, other values will not be allowed. The format is ., e.g.: '1.16'. The purpose of this format is make sure you have the opportunity to notice if the next release hides additional metrics, rather than being surprised when they are permanently removed in the release after that. This parameter is ignored if a config file is specified by --config. -v, --v Level number for the log level verbosity - --version version[=true] Print version information and quit - --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging (only works for the default text log format) + --version version[=true] --version, --version=raw prints version information and quits; --version=vX.Y.Z... sets the reported version + --vmodule pattern=N,... comma-separated list of pattern=N settings for file-filtered logging (only works for text log format) --write-config-to string If set, write the default configuration values to this file and exit. diff --git a/kubernetes/cli/kube-scheduler.txt b/kubernetes/cli/kube-scheduler.txt index 83738f5b6..27f317e7b 100644 --- a/kubernetes/cli/kube-scheduler.txt +++ b/kubernetes/cli/kube-scheduler.txt @@ -18,7 +18,7 @@ Misc flags: Secure serving flags: - --bind-address ip The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank or an unspecified address (0.0.0.0 or ::), all interfaces will be used. (default 0.0.0.0) + --bind-address ip The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank or an unspecified address (0.0.0.0 or ::), all interfaces and IP address families will be used. (default 0.0.0.0) --cert-dir string The directory where the TLS certs are located. If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. --http2-max-streams-per-connection int The limit that the server gives to clients for the maximum number of streams in an HTTP/2 connection. Zero means to use golang's default. --permit-address-sharing If true, SO_REUSEADDR will be used when binding the port. This allows binding to wildcard IPs like 0.0.0.0 and specific IPs in parallel, and it avoids waiting for the kernel to release sockets in TIME_WAIT state. [default=false] @@ -59,8 +59,6 @@ Deprecated flags: --kube-api-content-type string DEPRECATED: content type of requests sent to apiserver. This parameter is ignored if a config file is specified in --config. (default "application/vnd.kubernetes.protobuf") --kube-api-qps float32 DEPRECATED: QPS to use while talking with kubernetes apiserver. This parameter is ignored if a config file is specified in --config. (default 50) --kubeconfig string DEPRECATED: path to kubeconfig file with authorization and master location information. This parameter is ignored if a config file is specified in --config. - --lock-object-name string DEPRECATED: define the name of the lock object. Will be removed in favor of leader-elect-resource-name. This parameter is ignored if a config file is specified in --config. (default "kube-scheduler") - --lock-object-namespace string DEPRECATED: define the namespace of the lock object. Will be removed in favor of leader-elect-resource-namespace. This parameter is ignored if a config file is specified in --config. (default "kube-system") --pod-max-in-unschedulable-pods-duration duration DEPRECATED: the maximum time a pod can stay in unschedulablePods. If a pod stays in unschedulablePods for longer than this value, the pod will be moved from unschedulablePods to backoffQ or activeQ. This flag is deprecated and will be removed in 1.26 (default 5m0s) --profiling DEPRECATED: enable profiling via web interface host:port/debug/pprof/. This parameter is ignored if a config file is specified in --config. (default true) @@ -80,10 +78,9 @@ Feature gate flags: APIListChunking=true|false (BETA - default=true) APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) - APISelfSubjectReview=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) APIServerTracing=true|false (BETA - default=true) - AdmissionWebhookMatchConditions=true|false (ALPHA - default=false) + AdmissionWebhookMatchConditions=true|false (BETA - default=true) AggregatedDiscoveryEndpoint=true|false (BETA - default=true) AllAlpha=true|false (ALPHA - default=false) AllBeta=true|false (BETA - default=false) @@ -92,32 +89,32 @@ Feature gate flags: CPUManagerPolicyAlphaOptions=true|false (ALPHA - default=false) CPUManagerPolicyBetaOptions=true|false (BETA - default=true) CPUManagerPolicyOptions=true|false (BETA - default=true) + CRDValidationRatcheting=true|false (ALPHA - default=false) CSIMigrationPortworx=true|false (BETA - default=false) - CSIMigrationRBD=true|false (ALPHA - default=false) CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) CloudControllerManagerWebhook=true|false (ALPHA - default=false) CloudDualStackNodeIPs=true|false (ALPHA - default=false) ClusterTrustBundle=true|false (ALPHA - default=false) ComponentSLIs=true|false (BETA - default=true) + ConsistentListFromCache=true|false (ALPHA - default=false) ContainerCheckpoint=true|false (ALPHA - default=false) ContextualLogging=true|false (ALPHA - default=false) + CronJobsScheduledAnnotation=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) CustomResourceValidationExpressions=true|false (BETA - default=true) + DevicePluginCDIDevices=true|false (ALPHA - default=false) DisableCloudProviders=true|false (ALPHA - default=false) DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) DynamicResourceAllocation=true|false (ALPHA - default=false) ElasticIndexedJob=true|false (BETA - default=true) EventedPLEG=true|false (BETA - default=false) - ExpandedDNSConfig=true|false (BETA - default=true) - ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) GracefulNodeShutdown=true|false (BETA - default=true) GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) - IPTablesOwnershipCleanup=true|false (BETA - default=true) InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) @@ -125,18 +122,20 @@ Feature gate flags: InTreePluginGCEUnregister=true|false (ALPHA - default=false) InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) InTreePluginPortworxUnregister=true|false (ALPHA - default=false) - InTreePluginRBDUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) + JobBackoffLimitPerIndex=true|false (ALPHA - default=false) JobPodFailurePolicy=true|false (BETA - default=true) + JobPodReplacementPolicy=true|false (ALPHA - default=false) JobReadyPods=true|false (BETA - default=true) KMSv2=true|false (BETA - default=true) + KMSv2KDF=true|false (BETA - default=false) + KubeProxyDrainingTerminatingNodes=true|false (ALPHA - default=false) + KubeletCgroupDriverFromCRI=true|false (ALPHA - default=false) KubeletInUserNamespace=true|false (ALPHA - default=false) - KubeletPodResources=true|false (BETA - default=true) KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) KubeletPodResourcesGet=true|false (ALPHA - default=false) - KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) KubeletTracing=true|false (BETA - default=true) - LegacyServiceAccountTokenTracking=true|false (BETA - default=true) + LegacyServiceAccountTokenCleanUp=true|false (ALPHA - default=false) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) @@ -146,35 +145,35 @@ Feature gate flags: MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) MinDomainsInPodTopologySpread=true|false (BETA - default=true) - MinimizeIPTablesRestore=true|false (BETA - default=true) MultiCIDRRangeAllocator=true|false (ALPHA - default=false) MultiCIDRServiceAllocator=true|false (ALPHA - default=false) - NetworkPolicyStatus=true|false (ALPHA - default=false) NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) NodeLogQuery=true|false (ALPHA - default=false) - NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) - NodeSwap=true|false (ALPHA - default=false) + NodeSwap=true|false (BETA - default=false) OpenAPIEnums=true|false (BETA - default=true) PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) + PersistentVolumeLastPhaseTransitionTime=true|false (ALPHA - default=false) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) - PodHasNetworkCondition=true|false (ALPHA - default=false) + PodHostIPs=true|false (ALPHA - default=false) + PodIndexLabel=true|false (BETA - default=true) + PodReadyToStartContainersCondition=true|false (ALPHA - default=false) PodSchedulingReadiness=true|false (BETA - default=true) - ProbeTerminationGracePeriod=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) - ProxyTerminatingEndpoints=true|false (BETA - default=true) QOSReserved=true|false (ALPHA - default=false) ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) RemainingItemCount=true|false (BETA - default=true) - RetroactiveDefaultStorageClass=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) SELinuxMountReadWriteOncePod=true|false (BETA - default=true) + SchedulerQueueingHints=true|false (BETA - default=true) SecurityContextDeny=true|false (ALPHA - default=false) - ServiceNodePortStaticSubrange=true|false (ALPHA - default=false) + ServiceNodePortStaticSubrange=true|false (BETA - default=true) + SidecarContainers=true|false (ALPHA - default=false) SizeMemoryBackedVolumes=true|false (BETA - default=true) + SkipReadOnlyValidationGCE=true|false (ALPHA - default=false) StableLoadBalancerNodeSet=true|false (BETA - default=true) StatefulSetAutoDeletePVC=true|false (BETA - default=true) StatefulSetStartOrdinal=true|false (BETA - default=true) @@ -182,10 +181,11 @@ Feature gate flags: StorageVersionHash=true|false (BETA - default=true) TopologyAwareHints=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) - TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) - TopologyManagerPolicyOptions=true|false (ALPHA - default=false) - UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) - ValidatingAdmissionPolicy=true|false (ALPHA - default=false) + TopologyManagerPolicyBetaOptions=true|false (BETA - default=true) + TopologyManagerPolicyOptions=true|false (BETA - default=true) + UnknownVersionInteroperabilityProxy=true|false (ALPHA - default=false) + UserNamespacesSupport=true|false (ALPHA - default=false) + ValidatingAdmissionPolicy=true|false (BETA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) @@ -210,4 +210,4 @@ Logs flags: Global flags: -h, --help help for kube-scheduler - --version version[=true] Print version information and quit + --version version[=true] --version, --version=raw prints version information and quits; --version=vX.Y.Z... sets the reported version diff --git a/kubernetes/cli/kubelet.txt b/kubernetes/cli/kubelet.txt index 05485bb31..3167e89b3 100644 --- a/kubernetes/cli/kubelet.txt +++ b/kubernetes/cli/kubelet.txt @@ -22,7 +22,7 @@ Usage: kubelet [flags] Flags: - --address ip The IP address for the Kubelet to serve on (set to '0.0.0.0' or '::' for listening in all interfaces and IP families) (default 0.0.0.0) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --address ip The IP address for the Kubelet to serve on (set to '0.0.0.0' or '::' for listening on all interfaces and IP address families) (default 0.0.0.0) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --allowed-unsafe-sysctls strings Comma-separated whitelist of unsafe sysctls or unsafe sysctl patterns (ending in *). Use these at your own risk. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --anonymous-auth Enables anonymous requests to the Kubelet server. Requests that are not rejected by another authentication method are treated as anonymous requests. Anonymous requests have a username of system:anonymous, and a group name of system:unauthenticated. (default true) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --application-metrics-count-limit int Max number of application metrics to store (per container) (default 100) (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) @@ -31,7 +31,6 @@ Flags: --authorization-mode string Authorization mode for Kubelet server. Valid options are AlwaysAllow or Webhook. Webhook mode uses the SubjectAccessReview API to determine authorization. (default "AlwaysAllow") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --authorization-webhook-cache-authorized-ttl duration The duration to cache 'authorized' responses from the webhook authorizer. (default 5m0s) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --authorization-webhook-cache-unauthorized-ttl duration The duration to cache 'unauthorized' responses from the webhook authorizer. (default 30s) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --azure-container-registry-config string Path to the file containing Azure container registry configuration information. --boot-id-file string Comma-separated list of files to check for boot-id. Use the first one that exists. (default "/proc/sys/kernel/random/boot_id") (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) --bootstrap-kubeconfig string Path to a kubeconfig file that will be used to get client certificate for kubelet. If the file specified by --kubeconfig does not exist, the bootstrap kubeconfig is used to request a client certificate from the API server. On success, a kubeconfig file referencing the generated client certificate and key is written to the path specified by --kubeconfig. The client certificate and key file will be stored in the directory pointed by --cert-dir. --cert-dir string The directory where the TLS certs are located. If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "/var/lib/kubelet/pki") @@ -44,6 +43,7 @@ Flags: --cluster-dns strings Comma-separated list of DNS server IP address. This value is used for containers DNS server in case of Pods with "dnsPolicy=ClusterFirst". Note: all DNS servers appearing in the list MUST serve the same set of records otherwise name resolution within the cluster may not work correctly. There is no guarantee as to which DNS server may be contacted for name resolution. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --cluster-domain string Domain for this cluster. If set, kubelet will configure all containers to search this domain in addition to the host's search domains (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --config string The Kubelet will load its initial configuration from this file. The path may be absolute or relative; relative paths start at the Kubelet's current working directory. Omit this flag to use the built-in default configuration values. Command-line flags override configuration from this file. + --config-dir string Path to a directory to specify drop-ins, allows the user to optionally specify additional configs to overwrite what is provided by default and in the KubeletConfigFile flag. Note: Set the 'KUBELET_CONFIG_DROPIN_DIR_ALPHA' environment variable to specify the directory. [default=''] --container-hints string location of the container hints file (default "/etc/cadvisor/container_hints.json") (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) --container-log-max-files int32 Set the maximum number of container log files that can be present for a container. The number must be >= 2. (default 5) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --container-log-max-size string Set the maximum size (e.g. 10Mi) of container log file before it is rotated. (default "10Mi") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) @@ -79,10 +79,9 @@ Flags: APIListChunking=true|false (BETA - default=true) APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) - APISelfSubjectReview=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) APIServerTracing=true|false (BETA - default=true) - AdmissionWebhookMatchConditions=true|false (ALPHA - default=false) + AdmissionWebhookMatchConditions=true|false (BETA - default=true) AggregatedDiscoveryEndpoint=true|false (BETA - default=true) AllAlpha=true|false (ALPHA - default=false) AllBeta=true|false (BETA - default=false) @@ -91,32 +90,32 @@ Flags: CPUManagerPolicyAlphaOptions=true|false (ALPHA - default=false) CPUManagerPolicyBetaOptions=true|false (BETA - default=true) CPUManagerPolicyOptions=true|false (BETA - default=true) + CRDValidationRatcheting=true|false (ALPHA - default=false) CSIMigrationPortworx=true|false (BETA - default=false) - CSIMigrationRBD=true|false (ALPHA - default=false) CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) CloudControllerManagerWebhook=true|false (ALPHA - default=false) CloudDualStackNodeIPs=true|false (ALPHA - default=false) ClusterTrustBundle=true|false (ALPHA - default=false) ComponentSLIs=true|false (BETA - default=true) + ConsistentListFromCache=true|false (ALPHA - default=false) ContainerCheckpoint=true|false (ALPHA - default=false) ContextualLogging=true|false (ALPHA - default=false) + CronJobsScheduledAnnotation=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) CustomResourceValidationExpressions=true|false (BETA - default=true) + DevicePluginCDIDevices=true|false (ALPHA - default=false) DisableCloudProviders=true|false (ALPHA - default=false) DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) DynamicResourceAllocation=true|false (ALPHA - default=false) ElasticIndexedJob=true|false (BETA - default=true) EventedPLEG=true|false (BETA - default=false) - ExpandedDNSConfig=true|false (BETA - default=true) - ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false) GracefulNodeShutdown=true|false (BETA - default=true) GracefulNodeShutdownBasedOnPodPriority=true|false (BETA - default=true) HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) - IPTablesOwnershipCleanup=true|false (BETA - default=true) InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) @@ -124,18 +123,20 @@ Flags: InTreePluginGCEUnregister=true|false (ALPHA - default=false) InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) InTreePluginPortworxUnregister=true|false (ALPHA - default=false) - InTreePluginRBDUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) + JobBackoffLimitPerIndex=true|false (ALPHA - default=false) JobPodFailurePolicy=true|false (BETA - default=true) + JobPodReplacementPolicy=true|false (ALPHA - default=false) JobReadyPods=true|false (BETA - default=true) KMSv2=true|false (BETA - default=true) + KMSv2KDF=true|false (BETA - default=false) + KubeProxyDrainingTerminatingNodes=true|false (ALPHA - default=false) + KubeletCgroupDriverFromCRI=true|false (ALPHA - default=false) KubeletInUserNamespace=true|false (ALPHA - default=false) - KubeletPodResources=true|false (BETA - default=true) KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) KubeletPodResourcesGet=true|false (ALPHA - default=false) - KubeletPodResourcesGetAllocatable=true|false (BETA - default=true) KubeletTracing=true|false (BETA - default=true) - LegacyServiceAccountTokenTracking=true|false (BETA - default=true) + LegacyServiceAccountTokenCleanUp=true|false (ALPHA - default=false) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) @@ -145,35 +146,35 @@ Flags: MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) MinDomainsInPodTopologySpread=true|false (BETA - default=true) - MinimizeIPTablesRestore=true|false (BETA - default=true) MultiCIDRRangeAllocator=true|false (ALPHA - default=false) MultiCIDRServiceAllocator=true|false (ALPHA - default=false) - NetworkPolicyStatus=true|false (ALPHA - default=false) NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) NodeLogQuery=true|false (ALPHA - default=false) - NodeOutOfServiceVolumeDetach=true|false (BETA - default=true) - NodeSwap=true|false (ALPHA - default=false) + NodeSwap=true|false (BETA - default=false) OpenAPIEnums=true|false (BETA - default=true) PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) + PersistentVolumeLastPhaseTransitionTime=true|false (ALPHA - default=false) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) - PodHasNetworkCondition=true|false (ALPHA - default=false) + PodHostIPs=true|false (ALPHA - default=false) + PodIndexLabel=true|false (BETA - default=true) + PodReadyToStartContainersCondition=true|false (ALPHA - default=false) PodSchedulingReadiness=true|false (BETA - default=true) - ProbeTerminationGracePeriod=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) - ProxyTerminatingEndpoints=true|false (BETA - default=true) QOSReserved=true|false (ALPHA - default=false) ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) RemainingItemCount=true|false (BETA - default=true) - RetroactiveDefaultStorageClass=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) SELinuxMountReadWriteOncePod=true|false (BETA - default=true) + SchedulerQueueingHints=true|false (BETA - default=true) SecurityContextDeny=true|false (ALPHA - default=false) - ServiceNodePortStaticSubrange=true|false (ALPHA - default=false) + ServiceNodePortStaticSubrange=true|false (BETA - default=true) + SidecarContainers=true|false (ALPHA - default=false) SizeMemoryBackedVolumes=true|false (BETA - default=true) + SkipReadOnlyValidationGCE=true|false (ALPHA - default=false) StableLoadBalancerNodeSet=true|false (BETA - default=true) StatefulSetAutoDeletePVC=true|false (BETA - default=true) StatefulSetStartOrdinal=true|false (BETA - default=true) @@ -181,10 +182,11 @@ Flags: StorageVersionHash=true|false (BETA - default=true) TopologyAwareHints=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) - TopologyManagerPolicyBetaOptions=true|false (BETA - default=false) - TopologyManagerPolicyOptions=true|false (ALPHA - default=false) - UserNamespacesStatelessPodsSupport=true|false (ALPHA - default=false) - ValidatingAdmissionPolicy=true|false (ALPHA - default=false) + TopologyManagerPolicyBetaOptions=true|false (BETA - default=true) + TopologyManagerPolicyOptions=true|false (BETA - default=true) + UnknownVersionInteroperabilityProxy=true|false (ALPHA - default=false) + UserNamespacesSupport=true|false (ALPHA - default=false) + ValidatingAdmissionPolicy=true|false (BETA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) @@ -193,7 +195,7 @@ Flags: --file-check-frequency duration Duration between checking config files for new data (default 20s) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --global-housekeeping-interval duration Interval between global housekeepings (default 1m0s) (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) --hairpin-mode string How should the kubelet setup hairpin NAT. This allows endpoints of a Service to loadbalance back to themselves if they should try to access their own Service. Valid values are "promiscuous-bridge", "hairpin-veth" and "none". (default "promiscuous-bridge") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --healthz-bind-address ip The IP address for the healthz server to serve on (set to '0.0.0.0' or '::' for listening in all interfaces and IP families) (default 127.0.0.1) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --healthz-bind-address ip The IP address for the healthz server to serve on (set to '0.0.0.0' or '::' for listening on all interfaces and IP address families) (default 127.0.0.1) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --healthz-port int32 The port of the localhost healthz endpoint (set to 0 to disable) (default 10248) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) -h, --help help for kubelet --hostname-override string If non-empty, will use this string as identification instead of the actual hostname. If --cloud-provider is set, the cloud provider determines the name of the node (consult cloud provider documentation to determine if and how the hostname is used). @@ -202,10 +204,8 @@ Flags: --image-credential-provider-bin-dir string The path to the directory where credential provider plugin binaries are located. --image-credential-provider-config string The path to the credential provider plugin config file. --image-gc-high-threshold int32 The percent of disk usage after which image garbage collection is always run. Values must be within the range [0, 100], To disable image garbage collection, set to 100. (default 85) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --image-gc-low-threshold int32 The percent of disk usage before which image garbage collection is never run. Lowest disk usage to garbage collect to. Values must be within the range [0, 100] and should not be larger than that of --image-gc-high-threshold. (default 80) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --image-gc-low-threshold int32 The percent of disk usage before which image garbage collection is never run. Lowest disk usage to garbage collect to. Values must be within the range [0, 100] and must be less than that of --image-gc-high-threshold. (default 80) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --image-service-endpoint string The endpoint of container image service. If not specified, it will be the same with --container-runtime-endpoint by default. Unix Domain Socket are supported on Linux, while npipe and tcp endpoints are supported on Windows. Examples:'unix:///path/to/runtime.sock', 'npipe:////./pipe/runtime' (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --iptables-drop-bit int32 The bit of the fwmark space to mark packets for dropping. Must be within the range [0, 31]. (default 15) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --iptables-masquerade-bit int32 The bit of the fwmark space to mark packets for SNAT. Must be within the range [0, 31]. Please match this parameter with corresponding parameter in kube-proxy. (default 14) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --keep-terminated-pod-volumes Keep terminated pod volumes mounted to the node after the pod terminates. Can be useful for debugging volume related issues. (DEPRECATED: will be removed in a future version) --kernel-memcg-notification If enabled, the kubelet will integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --kube-api-burst int32 Burst to use while talking with kubernetes apiserver. The number must be >= 0. If 0 will use DefaultBurst: 100. Doesn't cover events and node heartbeat apis which rate limiting is controlled by a different set of flags (default 100) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) @@ -245,7 +245,7 @@ Flags: --pods-per-core int32 Number of Pods per core that can run on this Kubelet. The total number of Pods on this Kubelet cannot exceed max-pods, so max-pods will be used if this calculation results in a larger number of Pods allowed on the Kubelet. A value of 0 disables this limit. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --port int32 The port for the Kubelet to serve on. (default 10250) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --protect-kernel-defaults Default kubelet behaviour for kernel tuning. If set, kubelet errors if any of kernel tunables is different than kubelet defaults. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) - --provider-id string Unique identifier for identifying the node in a machine database, i.e cloudprovider (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + --provider-id string Unique identifier for identifying the node in a machine database, i.e cloudprovider --qos-reserved mapStringString A set of ResourceName=Percentage (e.g. memory=50%) pairs that describe how pod resource requests are reserved at the QoS level. Currently only memory is supported. Requires the QOSReserved feature gate to be enabled. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --read-only-port int32 The read-only port for the Kubelet to serve on with no authentication/authorization (set to 0 to disable) (default 10255) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --register-node Register the node with the apiserver. If --kubeconfig is not provided, this flag is irrelevant, as the Kubelet won't have an apiserver to register with. (default true) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) @@ -286,7 +286,7 @@ Flags: --topology-manager-policy-options mapStringString A set of key=value Topology Manager policy options to use, to fine tune their behaviour. If not supplied, keep the default behaviour. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --topology-manager-scope string Scope to which topology hints applied. Topology Manager collects hints from Hint Providers and applies them to defined scope to ensure the pod admission. Possible values: 'container', 'pod'. (default "container") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) -v, --v Level number for the log level verbosity - --version version[=true] Print version information and quit + --version version[=true] --version, --version=raw prints version information and quits; --version=vX.Y.Z... sets the reported version --vmodule pattern=N,... comma-separated list of pattern=N settings for file-filtered logging (only works for text log format) --volume-plugin-dir string The full path of the directory in which to search for additional third party volume plugins (default "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --volume-stats-agg-period duration Specifies interval for kubelet to calculate and cache the volume disk usage for all pods and volumes. To disable volume calculations, set to a negative number. (default 1m0s) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) diff --git a/kubernetes/cli/runc.txt b/kubernetes/cli/runc.txt index a917e565f..7a24cf4c7 100644 --- a/kubernetes/cli/runc.txt +++ b/kubernetes/cli/runc.txt @@ -27,10 +27,10 @@ USAGE: runc [global options] command [command options] [arguments...] VERSION: - 1.1.3 -commit: v1.1.3-0-g6724737f + 1.1.4 +commit: v1.1.4-0-g5fd4c4d1 spec: 1.0.2-dev -go: go1.17.13 +go: go1.20.2 libseccomp: 2.5.3 COMMANDS: From f04e7d73cafca7dc3a65e1abf5c06da5729c6c92 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 17 Feb 2024 17:30:53 +0800 Subject: [PATCH 36/42] [Kubernetes] Test v1.30.0-alpha.2 [sync git] Signed-off-by: Kang Huaishuai --- kubernetes/.github/workflows/setup-k8s.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index cbbf1851d..733817245 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -46,7 +46,7 @@ jobs: # next version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.30.0-alpha.1 + CI_KUBERNETES_VERSION: 1.30.0-alpha.2 LNMP_K8S_GET: --url GENERATE_CLI_HELP: "true" @@ -544,8 +544,8 @@ jobs: export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH BASE_BRANCH=v1.29.0-alpha.1-config BASE_BRANCH=master - BASE_BRANCH=v1.28.0-config - if [ $CI_KUBERNETES_VERSION != '1.30.0-alpha.1' ];then + # BASE_BRANCH=v1.28.0-config + if [ $CI_KUBERNETES_VERSION != '1.30.0-alpha.2' ];then exit 0 fi From 1e3bc2da3085d5e3996f69dd33e31e0173a65114 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 17 Feb 2024 18:18:59 +0800 Subject: [PATCH 37/42] [Kubernetes] Update cli help info v1.29.0 Signed-off-by: Kang Huaishuai --- kubernetes/cli/docker.txt | 4 +- kubernetes/cli/kube-apiserver.txt | 72 ++++++++++------- kubernetes/cli/kube-controller-manager.txt | 62 ++++++++------ kubernetes/cli/kube-proxy.txt | 94 ++++++++++++---------- kubernetes/cli/kube-scheduler.txt | 58 +++++++------ kubernetes/cli/kubelet.txt | 61 ++++++++------ 6 files changed, 201 insertions(+), 150 deletions(-) diff --git a/kubernetes/cli/docker.txt b/kubernetes/cli/docker.txt index f4a50b3f6..222078e0c 100644 --- a/kubernetes/cli/docker.txt +++ b/kubernetes/cli/docker.txt @@ -27,9 +27,9 @@ Options: Management Commands: app* Docker App (Docker Inc., v0.9.1-beta3) builder Manage builds - buildx* Docker Buildx (Docker Inc., v0.11.2) + buildx* Docker Buildx (Docker Inc., v0.10.4-docker) checkpoint Manage checkpoints - compose* Docker Compose (Docker Inc., v2.21.0) + compose* Docker Compose (Docker Inc., v2.24.5) config Manage Docker configs container Manage containers context Manage contexts diff --git a/kubernetes/cli/kube-apiserver.txt b/kubernetes/cli/kube-apiserver.txt index 81d1e29f2..bccc1b612 100644 --- a/kubernetes/cli/kube-apiserver.txt +++ b/kubernetes/cli/kube-apiserver.txt @@ -13,11 +13,8 @@ Generic flags: --cors-allowed-origins strings List of allowed origins for CORS, comma separated. An allowed origin can be a regular expression to support subdomain matching. If this list is empty CORS will not be enabled. Please ensure each expression matches the entire hostname by anchoring to the start with '^' or including the '//' prefix, and by anchoring to the end with '$' or including the ':' port separator suffix. Examples of valid expressions are '//example\.com(:|$)' and '^https://example\.com(:|$)' --default-not-ready-toleration-seconds int Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300) --default-unreachable-toleration-seconds int Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration. (default 300) - --enable-priority-and-fairness If true and the APIPriorityAndFairness feature gate is enabled, replace the max-in-flight handler with an enhanced one that queues and dispatches with priority and fairness (default true) --external-hostname string The hostname to use when generating externalized URLs for this master (e.g. Swagger API Docs or OpenID Discovery). --feature-gates mapStringBool A set of key=value pairs that describe feature gates for alpha/experimental features. Options are: - APIListChunking=true|false (BETA - default=true) - APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) APIServerTracing=true|false (BETA - default=true) @@ -32,11 +29,11 @@ Generic flags: CPUManagerPolicyOptions=true|false (BETA - default=true) CRDValidationRatcheting=true|false (ALPHA - default=false) CSIMigrationPortworx=true|false (BETA - default=false) - CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) CloudControllerManagerWebhook=true|false (ALPHA - default=false) - CloudDualStackNodeIPs=true|false (ALPHA - default=false) + CloudDualStackNodeIPs=true|false (BETA - default=true) ClusterTrustBundle=true|false (ALPHA - default=false) + ClusterTrustBundleProjection=true|false (ALPHA - default=false) ComponentSLIs=true|false (BETA - default=true) ConsistentListFromCache=true|false (ALPHA - default=false) ContainerCheckpoint=true|false (ALPHA - default=false) @@ -44,10 +41,10 @@ Generic flags: CronJobsScheduledAnnotation=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) - CustomResourceValidationExpressions=true|false (BETA - default=true) - DevicePluginCDIDevices=true|false (ALPHA - default=false) - DisableCloudProviders=true|false (ALPHA - default=false) - DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) + DevicePluginCDIDevices=true|false (BETA - default=true) + DisableCloudProviders=true|false (BETA - default=true) + DisableKubeletCloudCredentialProviders=true|false (BETA - default=true) + DisableNodeKubeProxyVersion=true|false (ALPHA - default=false) DynamicResourceAllocation=true|false (ALPHA - default=false) ElasticIndexedJob=true|false (BETA - default=true) EventedPLEG=true|false (BETA - default=false) @@ -56,6 +53,7 @@ Generic flags: HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) + ImageMaximumGCAge=true|false (ALPHA - default=false) InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) @@ -64,74 +62,84 @@ Generic flags: InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) InTreePluginPortworxUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) - JobBackoffLimitPerIndex=true|false (ALPHA - default=false) + JobBackoffLimitPerIndex=true|false (BETA - default=true) JobPodFailurePolicy=true|false (BETA - default=true) - JobPodReplacementPolicy=true|false (ALPHA - default=false) - JobReadyPods=true|false (BETA - default=true) - KMSv2=true|false (BETA - default=true) - KMSv2KDF=true|false (BETA - default=false) + JobPodReplacementPolicy=true|false (BETA - default=true) KubeProxyDrainingTerminatingNodes=true|false (ALPHA - default=false) KubeletCgroupDriverFromCRI=true|false (ALPHA - default=false) KubeletInUserNamespace=true|false (ALPHA - default=false) KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) KubeletPodResourcesGet=true|false (ALPHA - default=false) + KubeletSeparateDiskGC=true|false (ALPHA - default=false) KubeletTracing=true|false (BETA - default=true) - LegacyServiceAccountTokenCleanUp=true|false (ALPHA - default=false) + LegacyServiceAccountTokenCleanUp=true|false (BETA - default=true) + LoadBalancerIPMode=true|false (ALPHA - default=false) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) LoggingBetaOptions=true|false (BETA - default=true) + MatchLabelKeysInPodAffinity=true|false (ALPHA - default=false) MatchLabelKeysInPodTopologySpread=true|false (BETA - default=true) MaxUnavailableStatefulSet=true|false (ALPHA - default=false) MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) MinDomainsInPodTopologySpread=true|false (BETA - default=true) - MultiCIDRRangeAllocator=true|false (ALPHA - default=false) MultiCIDRServiceAllocator=true|false (ALPHA - default=false) + NFTablesProxyMode=true|false (ALPHA - default=false) NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) NodeLogQuery=true|false (ALPHA - default=false) NodeSwap=true|false (BETA - default=false) OpenAPIEnums=true|false (BETA - default=true) PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) - PersistentVolumeLastPhaseTransitionTime=true|false (ALPHA - default=false) + PersistentVolumeLastPhaseTransitionTime=true|false (BETA - default=true) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) - PodHostIPs=true|false (ALPHA - default=false) + PodHostIPs=true|false (BETA - default=true) PodIndexLabel=true|false (BETA - default=true) - PodReadyToStartContainersCondition=true|false (ALPHA - default=false) + PodLifecycleSleepAction=true|false (ALPHA - default=false) + PodReadyToStartContainersCondition=true|false (BETA - default=true) PodSchedulingReadiness=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) QOSReserved=true|false (ALPHA - default=false) - ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) - RemainingItemCount=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) + RuntimeClassInImageCriApi=true|false (ALPHA - default=false) SELinuxMountReadWriteOncePod=true|false (BETA - default=true) - SchedulerQueueingHints=true|false (BETA - default=true) + SchedulerQueueingHints=true|false (BETA - default=false) SecurityContextDeny=true|false (ALPHA - default=false) - ServiceNodePortStaticSubrange=true|false (BETA - default=true) - SidecarContainers=true|false (ALPHA - default=false) + SeparateTaintEvictionController=true|false (BETA - default=true) + ServiceAccountTokenJTI=true|false (ALPHA - default=false) + ServiceAccountTokenNodeBinding=true|false (ALPHA - default=false) + ServiceAccountTokenNodeBindingValidation=true|false (ALPHA - default=false) + ServiceAccountTokenPodNodeInfo=true|false (ALPHA - default=false) + SidecarContainers=true|false (BETA - default=true) SizeMemoryBackedVolumes=true|false (BETA - default=true) - SkipReadOnlyValidationGCE=true|false (ALPHA - default=false) StableLoadBalancerNodeSet=true|false (BETA - default=true) StatefulSetAutoDeletePVC=true|false (BETA - default=true) StatefulSetStartOrdinal=true|false (BETA - default=true) StorageVersionAPI=true|false (ALPHA - default=false) StorageVersionHash=true|false (BETA - default=true) + StructuredAuthenticationConfiguration=true|false (ALPHA - default=false) + StructuredAuthorizationConfiguration=true|false (ALPHA - default=false) TopologyAwareHints=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) TopologyManagerPolicyBetaOptions=true|false (BETA - default=true) TopologyManagerPolicyOptions=true|false (BETA - default=true) + TranslateStreamCloseWebsocketRequests=true|false (ALPHA - default=false) + UnauthenticatedHTTP2DOSMitigation=true|false (BETA - default=true) UnknownVersionInteroperabilityProxy=true|false (ALPHA - default=false) + UserNamespacesPodSecurityStandards=true|false (ALPHA - default=false) UserNamespacesSupport=true|false (ALPHA - default=false) ValidatingAdmissionPolicy=true|false (BETA - default=false) + VolumeAttributesClass=true|false (ALPHA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) WinOverlay=true|false (BETA - default=true) WindowsHostNetwork=true|false (ALPHA - default=true) + ZeroLimitedNominalConcurrencyShares=true|false (BETA - default=false) --goaway-chance float To prevent HTTP/2 clients from getting stuck on a single apiserver, randomly close a connection (GOAWAY). The client's other in-flight requests won't be affected, and the client will reconnect, likely landing on a different apiserver after going through the load balancer again. This argument sets the fraction of requests that will be sent a GOAWAY. Clusters with single apiservers, or which don't use a load balancer, should NOT enable this. Min is 0 (off), Max is .02 (1/50 requests); .001 (1/1000) is a recommended starting point. --livez-grace-period duration This option represents the maximum amount of time it should take for apiserver to complete its startup sequence and become live. From apiserver's start time to when this amount of time has elapsed, /livez will assume that unfinished post-start hooks will complete successfully and therefore return true. --max-mutating-requests-inflight int This and --max-requests-inflight are summed to determine the server's total concurrency limit (which must be positive) if --enable-priority-and-fairness is true. Otherwise, this flag limits the maximum number of mutating requests in flight, or a zero value disables the limit completely. (default 200) @@ -218,14 +226,16 @@ Auditing flags: Features flags: - --contention-profiling Enable block profiling, if profiling is enabled - --debug-socket-path string Use an unprotected (no authn/authz) unix-domain socket for profiling with the given path - --profiling Enable profiling via web interface host:port/debug/pprof/ (default true) + --contention-profiling Enable block profiling, if profiling is enabled + --debug-socket-path string Use an unprotected (no authn/authz) unix-domain socket for profiling with the given path + --enable-priority-and-fairness If true, replace the max-in-flight handler with an enhanced one that queues and dispatches with priority and fairness (default true) + --profiling Enable profiling via web interface host:port/debug/pprof/ (default true) Authentication flags: --anonymous-auth Enables anonymous requests to the secure port of the API server. Requests that are not rejected by another authentication method are treated as anonymous requests. Anonymous requests have a username of system:anonymous, and a group name of system:unauthenticated. (default true) --api-audiences strings Identifiers of the API. The service account token authenticator will validate that tokens used against the API are bound to at least one of these audiences. If the --service-account-issuer flag is configured and this flag is not, this field defaults to a single element list containing the issuer URL. + --authentication-config string File with Authentication Configuration to configure the JWT Token authenticator. Note: This feature is in Alpha since v1.29.--feature-gate=StructuredAuthenticationConfiguration=true needs to be set for enabling this feature.This feature is mutually exclusive with the oidc-* flags. --authentication-token-webhook-cache-ttl duration The duration to cache responses from the webhook token authenticator. (default 2m0s) --authentication-token-webhook-config-file string File with webhook configuration for token authentication in kubeconfig format. The API server will query the remote service to determine authentication for bearer tokens. --authentication-token-webhook-version string The API version of the authentication.k8s.io TokenReview to send to and expect from the webhook. (default "v1beta1") @@ -255,7 +265,8 @@ Authentication flags: Authorization flags: - --authorization-mode strings Ordered list of plug-ins to do authorization on secure port. Comma-delimited list of: AlwaysAllow,AlwaysDeny,ABAC,Webhook,RBAC,Node. (default [AlwaysAllow]) + --authorization-config string File with Authorization Configuration to configure the authorizer chain.Note: This feature is in Alpha since v1.29.--feature-gate=StructuredAuthorizationConfiguration=true feature flag needs to be set to true for enabling the functionality.This feature is mutually exclusive with the other --authorization-mode and --authorization-webhook-* flags. + --authorization-mode strings Ordered list of plug-ins to do authorization on secure port. Defaults to AlwaysAllow if --authorization-config is not used. Comma-delimited list of: AlwaysAllow,AlwaysDeny,ABAC,Webhook,RBAC,Node. --authorization-policy-file string File with authorization policy in json line by line format, used with --authorization-mode=ABAC, on the secure port. --authorization-webhook-cache-authorized-ttl duration The duration to cache 'authorized' responses from the webhook authorizer. (default 5m0s) --authorization-webhook-cache-unauthorized-ttl duration The duration to cache 'unauthorized' responses from the webhook authorizer. (default 30s) @@ -287,6 +298,7 @@ Admission flags: Metrics flags: --allow-metric-labels stringToString The map from metric-label to value allow-list of this label. The key's format is ,. The value's format is ,...e.g. metric1,label1='v1,v2,v3', metric1,label2='v1,v2,v3' metric2,label1='v1,v2,v3'. (default []) + --allow-metric-labels-manifest string The path to the manifest file that contains the allow-list mapping. The format of the file is the same as the flag --allow-metric-labels. Note that the flag --allow-metric-labels will override the manifest file. --disabled-metrics strings This flag provides an escape hatch for misbehaving metrics. You must provide the fully qualified metric name in order to disable it. Disclaimer: disabling metrics is higher in precedence than showing hidden metrics. --show-hidden-metrics-for-version string The previous version for which you want to show hidden metrics. Only the previous minor version is meaningful, other values will not be allowed. The format is ., e.g.: '1.16'. The purpose of this format is make sure you have the opportunity to notice if the next release hides additional metrics, rather than being surprised when they are permanently removed in the release after that. @@ -328,8 +340,6 @@ Misc flags: Cloud provider flags: - --cloud-config string The path to the cloud provider configuration file. Empty string for no configuration file. - --cloud-provider string The provider for cloud services. Empty string for no provider. Global flags: diff --git a/kubernetes/cli/kube-controller-manager.txt b/kubernetes/cli/kube-controller-manager.txt index 733765204..3f21abccd 100644 --- a/kubernetes/cli/kube-controller-manager.txt +++ b/kubernetes/cli/kube-controller-manager.txt @@ -31,12 +31,10 @@ Generic flags: --configure-cloud-routes Should CIDRs allocated by allocate-node-cidrs be configured on the cloud provider. (default true) --controller-start-interval duration Interval between starting controller managers. --controllers strings A list of controllers to enable. '*' enables all on-by-default controllers, 'foo' enables the controller named 'foo', '-foo' disables the controller named 'foo'. - All controllers: bootstrap-signer-controller, certificatesigningrequest-approving-controller, certificatesigningrequest-cleaner-controller, certificatesigningrequest-signing-controller, cloud-node-lifecycle-controller, clusterrole-aggregation-controller, cronjob-controller, daemonset-controller, deployment-controller, disruption-controller, endpoints-controller, endpointslice-controller, endpointslice-mirroring-controller, ephemeral-volume-controller, garbage-collector-controller, horizontal-pod-autoscaler-controller, job-controller, namespace-controller, node-ipam-controller, node-lifecycle-controller, node-route-controller, persistentvolume-attach-detach-controller, persistentvolume-binder-controller, persistentvolume-expander-controller, persistentvolume-protection-controller, persistentvolumeclaim-protection-controller, pod-garbage-collector-controller, replicaset-controller, replicationcontroller-controller, resourcequota-controller, root-ca-certificate-publisher-controller, service-lb-controller, serviceaccount-controller, serviceaccount-token-controller, statefulset-controller, token-cleaner-controller, ttl-after-finished-controller, ttl-controller + All controllers: bootstrap-signer-controller, certificatesigningrequest-approving-controller, certificatesigningrequest-cleaner-controller, certificatesigningrequest-signing-controller, cloud-node-lifecycle-controller, clusterrole-aggregation-controller, cronjob-controller, daemonset-controller, deployment-controller, disruption-controller, endpoints-controller, endpointslice-controller, endpointslice-mirroring-controller, ephemeral-volume-controller, garbage-collector-controller, horizontal-pod-autoscaler-controller, job-controller, legacy-serviceaccount-token-cleaner-controller, namespace-controller, node-ipam-controller, node-lifecycle-controller, node-route-controller, persistentvolume-attach-detach-controller, persistentvolume-binder-controller, persistentvolume-expander-controller, persistentvolume-protection-controller, persistentvolumeclaim-protection-controller, pod-garbage-collector-controller, replicaset-controller, replicationcontroller-controller, resourceclaim-controller, resourcequota-controller, root-ca-certificate-publisher-controller, service-cidr-controller, service-lb-controller, serviceaccount-controller, serviceaccount-token-controller, statefulset-controller, storageversion-garbage-collector-controller, taint-eviction-controller, token-cleaner-controller, ttl-after-finished-controller, ttl-controller, validatingadmissionpolicy-status-controller Disabled-by-default controllers: bootstrap-signer-controller, token-cleaner-controller (default [*]) --external-cloud-volume-plugin string The plugin to use when cloud provider is set to external. Can be empty, should only be set when cloud-provider is external. Currently used to allow node-ipam-controller, persistentvolume-binder-controller, persistentvolume-expander-controller and attach-detach-controller to work for in tree cloud providers. --feature-gates mapStringBool A set of key=value pairs that describe feature gates for alpha/experimental features. Options are: - APIListChunking=true|false (BETA - default=true) - APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) APIServerTracing=true|false (BETA - default=true) @@ -51,11 +49,11 @@ Generic flags: CPUManagerPolicyOptions=true|false (BETA - default=true) CRDValidationRatcheting=true|false (ALPHA - default=false) CSIMigrationPortworx=true|false (BETA - default=false) - CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) CloudControllerManagerWebhook=true|false (ALPHA - default=false) - CloudDualStackNodeIPs=true|false (ALPHA - default=false) + CloudDualStackNodeIPs=true|false (BETA - default=true) ClusterTrustBundle=true|false (ALPHA - default=false) + ClusterTrustBundleProjection=true|false (ALPHA - default=false) ComponentSLIs=true|false (BETA - default=true) ConsistentListFromCache=true|false (ALPHA - default=false) ContainerCheckpoint=true|false (ALPHA - default=false) @@ -63,10 +61,10 @@ Generic flags: CronJobsScheduledAnnotation=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) - CustomResourceValidationExpressions=true|false (BETA - default=true) - DevicePluginCDIDevices=true|false (ALPHA - default=false) - DisableCloudProviders=true|false (ALPHA - default=false) - DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) + DevicePluginCDIDevices=true|false (BETA - default=true) + DisableCloudProviders=true|false (BETA - default=true) + DisableKubeletCloudCredentialProviders=true|false (BETA - default=true) + DisableNodeKubeProxyVersion=true|false (ALPHA - default=false) DynamicResourceAllocation=true|false (ALPHA - default=false) ElasticIndexedJob=true|false (BETA - default=true) EventedPLEG=true|false (BETA - default=false) @@ -75,6 +73,7 @@ Generic flags: HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) + ImageMaximumGCAge=true|false (ALPHA - default=false) InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) @@ -83,74 +82,84 @@ Generic flags: InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) InTreePluginPortworxUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) - JobBackoffLimitPerIndex=true|false (ALPHA - default=false) + JobBackoffLimitPerIndex=true|false (BETA - default=true) JobPodFailurePolicy=true|false (BETA - default=true) - JobPodReplacementPolicy=true|false (ALPHA - default=false) - JobReadyPods=true|false (BETA - default=true) - KMSv2=true|false (BETA - default=true) - KMSv2KDF=true|false (BETA - default=false) + JobPodReplacementPolicy=true|false (BETA - default=true) KubeProxyDrainingTerminatingNodes=true|false (ALPHA - default=false) KubeletCgroupDriverFromCRI=true|false (ALPHA - default=false) KubeletInUserNamespace=true|false (ALPHA - default=false) KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) KubeletPodResourcesGet=true|false (ALPHA - default=false) + KubeletSeparateDiskGC=true|false (ALPHA - default=false) KubeletTracing=true|false (BETA - default=true) - LegacyServiceAccountTokenCleanUp=true|false (ALPHA - default=false) + LegacyServiceAccountTokenCleanUp=true|false (BETA - default=true) + LoadBalancerIPMode=true|false (ALPHA - default=false) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) LoggingBetaOptions=true|false (BETA - default=true) + MatchLabelKeysInPodAffinity=true|false (ALPHA - default=false) MatchLabelKeysInPodTopologySpread=true|false (BETA - default=true) MaxUnavailableStatefulSet=true|false (ALPHA - default=false) MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) MinDomainsInPodTopologySpread=true|false (BETA - default=true) - MultiCIDRRangeAllocator=true|false (ALPHA - default=false) MultiCIDRServiceAllocator=true|false (ALPHA - default=false) + NFTablesProxyMode=true|false (ALPHA - default=false) NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) NodeLogQuery=true|false (ALPHA - default=false) NodeSwap=true|false (BETA - default=false) OpenAPIEnums=true|false (BETA - default=true) PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) - PersistentVolumeLastPhaseTransitionTime=true|false (ALPHA - default=false) + PersistentVolumeLastPhaseTransitionTime=true|false (BETA - default=true) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) - PodHostIPs=true|false (ALPHA - default=false) + PodHostIPs=true|false (BETA - default=true) PodIndexLabel=true|false (BETA - default=true) - PodReadyToStartContainersCondition=true|false (ALPHA - default=false) + PodLifecycleSleepAction=true|false (ALPHA - default=false) + PodReadyToStartContainersCondition=true|false (BETA - default=true) PodSchedulingReadiness=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) QOSReserved=true|false (ALPHA - default=false) - ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) - RemainingItemCount=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) + RuntimeClassInImageCriApi=true|false (ALPHA - default=false) SELinuxMountReadWriteOncePod=true|false (BETA - default=true) - SchedulerQueueingHints=true|false (BETA - default=true) + SchedulerQueueingHints=true|false (BETA - default=false) SecurityContextDeny=true|false (ALPHA - default=false) - ServiceNodePortStaticSubrange=true|false (BETA - default=true) - SidecarContainers=true|false (ALPHA - default=false) + SeparateTaintEvictionController=true|false (BETA - default=true) + ServiceAccountTokenJTI=true|false (ALPHA - default=false) + ServiceAccountTokenNodeBinding=true|false (ALPHA - default=false) + ServiceAccountTokenNodeBindingValidation=true|false (ALPHA - default=false) + ServiceAccountTokenPodNodeInfo=true|false (ALPHA - default=false) + SidecarContainers=true|false (BETA - default=true) SizeMemoryBackedVolumes=true|false (BETA - default=true) - SkipReadOnlyValidationGCE=true|false (ALPHA - default=false) StableLoadBalancerNodeSet=true|false (BETA - default=true) StatefulSetAutoDeletePVC=true|false (BETA - default=true) StatefulSetStartOrdinal=true|false (BETA - default=true) StorageVersionAPI=true|false (ALPHA - default=false) StorageVersionHash=true|false (BETA - default=true) + StructuredAuthenticationConfiguration=true|false (ALPHA - default=false) + StructuredAuthorizationConfiguration=true|false (ALPHA - default=false) TopologyAwareHints=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) TopologyManagerPolicyBetaOptions=true|false (BETA - default=true) TopologyManagerPolicyOptions=true|false (BETA - default=true) + TranslateStreamCloseWebsocketRequests=true|false (ALPHA - default=false) + UnauthenticatedHTTP2DOSMitigation=true|false (BETA - default=true) UnknownVersionInteroperabilityProxy=true|false (ALPHA - default=false) + UserNamespacesPodSecurityStandards=true|false (ALPHA - default=false) UserNamespacesSupport=true|false (ALPHA - default=false) ValidatingAdmissionPolicy=true|false (BETA - default=false) + VolumeAttributesClass=true|false (ALPHA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) WinOverlay=true|false (BETA - default=true) WindowsHostNetwork=true|false (ALPHA - default=true) + ZeroLimitedNominalConcurrencyShares=true|false (BETA - default=false) --kube-api-burst int32 Burst to use while talking with kubernetes apiserver. (default 30) --kube-api-content-type string Content type of requests sent to apiserver. (default "application/vnd.kubernetes.protobuf") --kube-api-qps float32 QPS to use while talking with kubernetes apiserver. (default 20) @@ -294,7 +303,7 @@ Node-ipam-controller flags: Node-lifecycle-controller flags: - --large-cluster-size-threshold int32 Number of nodes from which node-lifecycle-controller treats the cluster as large for the eviction logic purposes. --secondary-node-eviction-rate is implicitly overridden to 0 for clusters this size or smaller. (default 50) + --large-cluster-size-threshold int32 Number of nodes from which node-lifecycle-controller treats the cluster as large for the eviction logic purposes. --secondary-node-eviction-rate is implicitly overridden to 0 for clusters this size or smaller. Notice: If nodes reside in multiple zones, this threshold will be considered as zone node size threshold for each zone to determine node eviction rate independently. (default 50) --node-eviction-rate float32 Number of nodes per second on which pods are deleted in case of node failure when a zone is healthy (see --unhealthy-zone-threshold for definition of healthy/unhealthy). Zone refers to entire cluster in non-multizone clusters. (default 0.1) --node-monitor-grace-period duration Amount of time which we allow running Node to be unresponsive before marking it unhealthy. Must be N times more than kubelet's nodeStatusUpdateFrequency, where N means number of retries allowed for kubelet to post node status. (default 40s) --node-startup-grace-period duration Amount of time which we allow starting Node to be unresponsive before marking it unhealthy. (default 1m0s) @@ -348,6 +357,7 @@ Validatingadmissionpolicy-status-controller flags: Metrics flags: --allow-metric-labels stringToString The map from metric-label to value allow-list of this label. The key's format is ,. The value's format is ,...e.g. metric1,label1='v1,v2,v3', metric1,label2='v1,v2,v3' metric2,label1='v1,v2,v3'. (default []) + --allow-metric-labels-manifest string The path to the manifest file that contains the allow-list mapping. The format of the file is the same as the flag --allow-metric-labels. Note that the flag --allow-metric-labels will override the manifest file. --disabled-metrics strings This flag provides an escape hatch for misbehaving metrics. You must provide the fully qualified metric name in order to disable it. Disclaimer: disabling metrics is higher in precedence than showing hidden metrics. --show-hidden-metrics-for-version string The previous version for which you want to show hidden metrics. Only the previous minor version is meaningful, other values will not be allowed. The format is ., e.g.: '1.16'. The purpose of this format is make sure you have the opportunity to notice if the next release hides additional metrics, rather than being surprised when they are permanently removed in the release after that. diff --git a/kubernetes/cli/kube-proxy.txt b/kubernetes/cli/kube-proxy.txt index ae615ade3..b592fc31e 100644 --- a/kubernetes/cli/kube-proxy.txt +++ b/kubernetes/cli/kube-proxy.txt @@ -10,21 +10,22 @@ Usage: kube-proxy [flags] Flags: - --bind-address ip The IP address for the proxy server to serve on (set to '0.0.0.0' for all IPv4 interfaces and '::' for all IPv6 interfaces). This parameter is ignored if a config file is specified by --config. (default 0.0.0.0) + --bind-address ip Overrides kube-proxy's idea of what its node's primary IP is. Note that the name is a historical artifact, and kube-proxy does not actually bind any sockets to this IP. This parameter is ignored if a config file is specified by --config. (default 0.0.0.0) --bind-address-hard-fail If true kube-proxy will treat failure to bind to a port as fatal and exit --boot-id-file string Comma-separated list of files to check for boot-id. Use the first one that exists. (default "/proc/sys/kernel/random/boot_id") --cleanup If true cleanup iptables and ipvs rules and exit. - --cluster-cidr string The CIDR range of pods in the cluster. When configured, traffic sent to a Service cluster IP from outside this range will be masqueraded and traffic sent from pods to an external LoadBalancer IP will be directed to the respective cluster IP instead. For dual-stack clusters, a comma-separated list is accepted with at least one CIDR per IP family (IPv4 and IPv6). This parameter is ignored if a config file is specified by --config. + --cluster-cidr string The CIDR range of the pods in the cluster. (For dual-stack clusters, this can be a comma-separated dual-stack pair of CIDR ranges.). When --detect-local-mode is set to ClusterCIDR, kube-proxy will consider traffic to be local if its source IP is in this range. (Otherwise it is not used.) This parameter is ignored if a config file is specified by --config. --config string The path to the configuration file. --config-sync-period duration How often configuration from the apiserver is refreshed. Must be greater than 0. (default 15m0s) --conntrack-max-per-core int32 Maximum number of NAT connections to track per CPU core (0 to leave the limit as-is and ignore conntrack-min). (default 32768) --conntrack-min int32 Minimum number of conntrack entries to allocate, regardless of conntrack-max-per-core (set conntrack-max-per-core=0 to leave the limit as-is). (default 131072) + --conntrack-tcp-be-liberal Enable liberal mode for tracking TCP packets by setting nf_conntrack_tcp_be_liberal to 1 --conntrack-tcp-timeout-close-wait duration NAT timeout for TCP connections in the CLOSE_WAIT state (default 1h0m0s) --conntrack-tcp-timeout-established duration Idle timeout for established TCP connections (0 to leave as-is) (default 24h0m0s) + --conntrack-udp-timeout duration Idle timeout for UNREPLIED UDP connections (0 to leave as-is) + --conntrack-udp-timeout-stream duration Idle timeout for ASSURED UDP connections (0 to leave as-is) --detect-local-mode LocalMode Mode to use to detect local traffic. This parameter is ignored if a config file is specified by --config. --feature-gates mapStringBool A set of key=value pairs that describe feature gates for alpha/experimental features. Options are: - APIListChunking=true|false (BETA - default=true) - APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) APIServerTracing=true|false (BETA - default=true) @@ -39,11 +40,11 @@ Flags: CPUManagerPolicyOptions=true|false (BETA - default=true) CRDValidationRatcheting=true|false (ALPHA - default=false) CSIMigrationPortworx=true|false (BETA - default=false) - CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) CloudControllerManagerWebhook=true|false (ALPHA - default=false) - CloudDualStackNodeIPs=true|false (ALPHA - default=false) + CloudDualStackNodeIPs=true|false (BETA - default=true) ClusterTrustBundle=true|false (ALPHA - default=false) + ClusterTrustBundleProjection=true|false (ALPHA - default=false) ComponentSLIs=true|false (BETA - default=true) ConsistentListFromCache=true|false (ALPHA - default=false) ContainerCheckpoint=true|false (ALPHA - default=false) @@ -51,10 +52,10 @@ Flags: CronJobsScheduledAnnotation=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) - CustomResourceValidationExpressions=true|false (BETA - default=true) - DevicePluginCDIDevices=true|false (ALPHA - default=false) - DisableCloudProviders=true|false (ALPHA - default=false) - DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) + DevicePluginCDIDevices=true|false (BETA - default=true) + DisableCloudProviders=true|false (BETA - default=true) + DisableKubeletCloudCredentialProviders=true|false (BETA - default=true) + DisableNodeKubeProxyVersion=true|false (ALPHA - default=false) DynamicResourceAllocation=true|false (ALPHA - default=false) ElasticIndexedJob=true|false (BETA - default=true) EventedPLEG=true|false (BETA - default=false) @@ -63,6 +64,7 @@ Flags: HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) + ImageMaximumGCAge=true|false (ALPHA - default=false) InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) @@ -71,87 +73,98 @@ Flags: InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) InTreePluginPortworxUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) - JobBackoffLimitPerIndex=true|false (ALPHA - default=false) + JobBackoffLimitPerIndex=true|false (BETA - default=true) JobPodFailurePolicy=true|false (BETA - default=true) - JobPodReplacementPolicy=true|false (ALPHA - default=false) - JobReadyPods=true|false (BETA - default=true) - KMSv2=true|false (BETA - default=true) - KMSv2KDF=true|false (BETA - default=false) + JobPodReplacementPolicy=true|false (BETA - default=true) KubeProxyDrainingTerminatingNodes=true|false (ALPHA - default=false) KubeletCgroupDriverFromCRI=true|false (ALPHA - default=false) KubeletInUserNamespace=true|false (ALPHA - default=false) KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) KubeletPodResourcesGet=true|false (ALPHA - default=false) + KubeletSeparateDiskGC=true|false (ALPHA - default=false) KubeletTracing=true|false (BETA - default=true) - LegacyServiceAccountTokenCleanUp=true|false (ALPHA - default=false) + LegacyServiceAccountTokenCleanUp=true|false (BETA - default=true) + LoadBalancerIPMode=true|false (ALPHA - default=false) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) LoggingBetaOptions=true|false (BETA - default=true) + MatchLabelKeysInPodAffinity=true|false (ALPHA - default=false) MatchLabelKeysInPodTopologySpread=true|false (BETA - default=true) MaxUnavailableStatefulSet=true|false (ALPHA - default=false) MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) MinDomainsInPodTopologySpread=true|false (BETA - default=true) - MultiCIDRRangeAllocator=true|false (ALPHA - default=false) MultiCIDRServiceAllocator=true|false (ALPHA - default=false) + NFTablesProxyMode=true|false (ALPHA - default=false) NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) NodeLogQuery=true|false (ALPHA - default=false) NodeSwap=true|false (BETA - default=false) OpenAPIEnums=true|false (BETA - default=true) PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) - PersistentVolumeLastPhaseTransitionTime=true|false (ALPHA - default=false) + PersistentVolumeLastPhaseTransitionTime=true|false (BETA - default=true) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) - PodHostIPs=true|false (ALPHA - default=false) + PodHostIPs=true|false (BETA - default=true) PodIndexLabel=true|false (BETA - default=true) - PodReadyToStartContainersCondition=true|false (ALPHA - default=false) + PodLifecycleSleepAction=true|false (ALPHA - default=false) + PodReadyToStartContainersCondition=true|false (BETA - default=true) PodSchedulingReadiness=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) QOSReserved=true|false (ALPHA - default=false) - ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) - RemainingItemCount=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) + RuntimeClassInImageCriApi=true|false (ALPHA - default=false) SELinuxMountReadWriteOncePod=true|false (BETA - default=true) - SchedulerQueueingHints=true|false (BETA - default=true) + SchedulerQueueingHints=true|false (BETA - default=false) SecurityContextDeny=true|false (ALPHA - default=false) - ServiceNodePortStaticSubrange=true|false (BETA - default=true) - SidecarContainers=true|false (ALPHA - default=false) + SeparateTaintEvictionController=true|false (BETA - default=true) + ServiceAccountTokenJTI=true|false (ALPHA - default=false) + ServiceAccountTokenNodeBinding=true|false (ALPHA - default=false) + ServiceAccountTokenNodeBindingValidation=true|false (ALPHA - default=false) + ServiceAccountTokenPodNodeInfo=true|false (ALPHA - default=false) + SidecarContainers=true|false (BETA - default=true) SizeMemoryBackedVolumes=true|false (BETA - default=true) - SkipReadOnlyValidationGCE=true|false (ALPHA - default=false) StableLoadBalancerNodeSet=true|false (BETA - default=true) StatefulSetAutoDeletePVC=true|false (BETA - default=true) StatefulSetStartOrdinal=true|false (BETA - default=true) StorageVersionAPI=true|false (ALPHA - default=false) StorageVersionHash=true|false (BETA - default=true) + StructuredAuthenticationConfiguration=true|false (ALPHA - default=false) + StructuredAuthorizationConfiguration=true|false (ALPHA - default=false) TopologyAwareHints=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) TopologyManagerPolicyBetaOptions=true|false (BETA - default=true) TopologyManagerPolicyOptions=true|false (BETA - default=true) + TranslateStreamCloseWebsocketRequests=true|false (ALPHA - default=false) + UnauthenticatedHTTP2DOSMitigation=true|false (BETA - default=true) UnknownVersionInteroperabilityProxy=true|false (ALPHA - default=false) + UserNamespacesPodSecurityStandards=true|false (ALPHA - default=false) UserNamespacesSupport=true|false (ALPHA - default=false) ValidatingAdmissionPolicy=true|false (BETA - default=false) + VolumeAttributesClass=true|false (ALPHA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) WinOverlay=true|false (BETA - default=true) WindowsHostNetwork=true|false (ALPHA - default=true) + ZeroLimitedNominalConcurrencyShares=true|false (BETA - default=false) This parameter is ignored if a config file is specified by --config. - --healthz-bind-address ipport The IP address with port for the health check server to serve on (set to '0.0.0.0:10256' for all IPv4 interfaces and '[::]:10256' for all IPv6 interfaces). Set empty to disable. This parameter is ignored if a config file is specified by --config. (default 0.0.0.0:10256) + --healthz-bind-address ipport The IP address and port for the health check server to serve on, defaulting to "0.0.0.0:10256" (if --bind-address is unset or IPv4), or "[::]:10256" (if --bind-address is IPv6). Set empty to disable. This parameter is ignored if a config file is specified by --config. (default 0.0.0.0:10256) -h, --help help for kube-proxy - --hostname-override string If non-empty, will use this string as identification instead of the actual hostname. - --iptables-localhost-nodeports If false Kube-proxy will disable the legacy behavior of allowing NodePort services to be accessed via localhost, This only applies to iptables mode and ipv4. (default true) - --iptables-masquerade-bit int32 If using the pure iptables proxy, the bit of the fwmark space to mark packets requiring SNAT with. Must be within the range [0, 31]. (default 14) - --iptables-min-sync-period duration The minimum interval of how often the iptables rules can be refreshed as endpoints and services change (e.g. '5s', '1m', '2h22m'). (default 1s) - --iptables-sync-period duration The maximum interval of how often iptables rules are refreshed (e.g. '5s', '1m', '2h22m'). Must be greater than 0. (default 30s) - --ipvs-exclude-cidrs strings A comma-separated list of CIDR's which the ipvs proxier should not touch when cleaning up IPVS rules. - --ipvs-min-sync-period duration The minimum interval of how often the ipvs rules can be refreshed as endpoints and services change (e.g. '5s', '1m', '2h22m'). + --hostname-override string If non-empty, will be used as the name of the Node that kube-proxy is running on. If unset, the node name is assumed to be the same as the node's hostname. + --init-only If true, perform any initialization steps that must be done with full root privileges, and then exit. After doing this, you can run kube-proxy again with only the CAP_NET_ADMIN capability. + --iptables-localhost-nodeports If false, kube-proxy will disable the legacy behavior of allowing NodePort services to be accessed via localhost. (Applies only to iptables mode and IPv4; localhost NodePorts are never allowed with other proxy modes or with IPv6.) (default true) + --iptables-masquerade-bit int32 If using the iptables or ipvs proxy mode, the bit of the fwmark space to mark packets requiring SNAT with. Must be within the range [0, 31]. (default 14) + --iptables-min-sync-period duration The minimum period between iptables rule resyncs (e.g. '5s', '1m', '2h22m'). A value of 0 means every Service or EndpointSlice change will result in an immediate iptables resync. (default 1s) + --iptables-sync-period duration An interval (e.g. '5s', '1m', '2h22m') indicating how frequently various re-synchronizing and cleanup operations are performed. Must be greater than 0. (default 30s) + --ipvs-exclude-cidrs strings A comma-separated list of CIDRs which the ipvs proxier should not touch when cleaning up IPVS rules. + --ipvs-min-sync-period duration The minimum period between IPVS rule resyncs (e.g. '5s', '1m', '2h22m'). A value of 0 means every Service or EndpointSlice change will result in an immediate IPVS resync. --ipvs-scheduler string The ipvs scheduler type when proxy mode is ipvs --ipvs-strict-arp Enable strict ARP by setting arp_ignore to 1 and arp_announce to 2 - --ipvs-sync-period duration The maximum interval of how often ipvs rules are refreshed (e.g. '5s', '1m', '2h22m'). Must be greater than 0. (default 30s) + --ipvs-sync-period duration An interval (e.g. '5s', '1m', '2h22m') indicating how frequently various re-synchronizing and cleanup operations are performed. Must be greater than 0. (default 30s) --ipvs-tcp-timeout duration The timeout for idle IPVS TCP connections, 0 to leave as-is. (e.g. '5s', '1m', '2h22m'). --ipvs-tcpfin-timeout duration The timeout for IPVS TCP connections after receiving a FIN packet, 0 to leave as-is. (e.g. '5s', '1m', '2h22m'). --ipvs-udp-timeout duration The timeout for IPVS UDP packets, 0 to leave as-is. (e.g. '5s', '1m', '2h22m'). @@ -164,16 +177,15 @@ Flags: --log-json-split-stream [Alpha] In JSON format, write error messages to stderr and info messages to stdout. The default is to write a single stream to stdout. Enable the LoggingAlphaOptions feature gate to use this. --logging-format string Sets the log format. Permitted formats: "json" (gated by LoggingBetaOptions), "text". (default "text") --machine-id-file string Comma-separated list of files to check for machine-id. Use the first one that exists. (default "/etc/machine-id,/var/lib/dbus/machine-id") - --masquerade-all If using the pure iptables proxy, SNAT all traffic sent via Service cluster IPs (this not commonly needed) + --masquerade-all If using the iptables or ipvs proxy mode, SNAT all traffic sent via Service cluster IPs. This may be required with some CNI plugins. --master string The address of the Kubernetes API server (overrides any value in kubeconfig) - --metrics-bind-address ipport The IP address with port for the metrics server to serve on (set to '0.0.0.0:10249' for all IPv4 interfaces and '[::]:10249' for all IPv6 interfaces). Set empty to disable. This parameter is ignored if a config file is specified by --config. (default 127.0.0.1:10249) - --nodeport-addresses strings A string slice of values which specify the addresses to use for NodePorts. Values may be valid IP blocks (e.g. 1.2.3.0/24, 1.2.3.4/32). The default empty string slice ([]) means to use all local addresses. This parameter is ignored if a config file is specified by --config. + --metrics-bind-address ipport The IP address and port for the metrics server to serve on, defaulting to "127.0.0.1:10249" (if --bind-address is unset or IPv4), or "[::1]:10249" (if --bind-address is IPv6). (Set to "0.0.0.0:10249" / "[::]:10249" to bind on all interfaces.) Set empty to disable. This parameter is ignored if a config file is specified by --config. (default 127.0.0.1:10249) + --nodeport-addresses strings A list of CIDR ranges that contain valid node IPs. If set, connections to NodePort services will only be accepted on node IPs in one of the indicated ranges. If unset, NodePort connections will be accepted on all local IPs. This parameter is ignored if a config file is specified by --config. --oom-score-adj int32 The oom-score-adj value for kube-proxy process. Values must be within the range [-1000, 1000]. This parameter is ignored if a config file is specified by --config. (default -999) - --pod-bridge-interface string A bridge interface name in the cluster. Kube-proxy considers traffic as local if originating from an interface which matches the value. This argument should be set if DetectLocalMode is set to BridgeInterface. - --pod-interface-name-prefix string An interface prefix in the cluster. Kube-proxy considers traffic as local if originating from interfaces that match the given prefix. This argument should be set if DetectLocalMode is set to InterfaceNamePrefix. + --pod-bridge-interface string A bridge interface name. When --detect-local-mode is set to BridgeInterface, kube-proxy will consider traffic to be local if it originates from this bridge. + --pod-interface-name-prefix string An interface name prefix. When --detect-local-mode is set to InterfaceNamePrefix, kube-proxy will consider traffic to be local if it originates from any interface whose name begins with this prefix. --profiling If true enables profiling via web interface on /debug/pprof handler. This parameter is ignored if a config file is specified by --config. --proxy-mode ProxyMode Which proxy mode to use: on Linux this can be 'iptables' (default) or 'ipvs'. On Windows the only supported value is 'kernelspace'.This parameter is ignored if a config file is specified by --config. - --proxy-port-range port-range Range of host ports (beginPort-endPort, single port or beginPort+offset, inclusive) that may be consumed in order to proxy service traffic. If (unspecified, 0, or 0-0) then ports will be randomly chosen. --show-hidden-metrics-for-version string The previous version for which you want to show hidden metrics. Only the previous minor version is meaningful, other values will not be allowed. The format is ., e.g.: '1.16'. The purpose of this format is make sure you have the opportunity to notice if the next release hides additional metrics, rather than being surprised when they are permanently removed in the release after that. This parameter is ignored if a config file is specified by --config. -v, --v Level number for the log level verbosity --version version[=true] --version, --version=raw prints version information and quits; --version=vX.Y.Z... sets the reported version diff --git a/kubernetes/cli/kube-scheduler.txt b/kubernetes/cli/kube-scheduler.txt index 27f317e7b..d5fbf7281 100644 --- a/kubernetes/cli/kube-scheduler.txt +++ b/kubernetes/cli/kube-scheduler.txt @@ -75,8 +75,6 @@ Leader election flags: Feature gate flags: --feature-gates mapStringBool A set of key=value pairs that describe feature gates for alpha/experimental features. Options are: - APIListChunking=true|false (BETA - default=true) - APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) APIServerTracing=true|false (BETA - default=true) @@ -91,11 +89,11 @@ Feature gate flags: CPUManagerPolicyOptions=true|false (BETA - default=true) CRDValidationRatcheting=true|false (ALPHA - default=false) CSIMigrationPortworx=true|false (BETA - default=false) - CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) CloudControllerManagerWebhook=true|false (ALPHA - default=false) - CloudDualStackNodeIPs=true|false (ALPHA - default=false) + CloudDualStackNodeIPs=true|false (BETA - default=true) ClusterTrustBundle=true|false (ALPHA - default=false) + ClusterTrustBundleProjection=true|false (ALPHA - default=false) ComponentSLIs=true|false (BETA - default=true) ConsistentListFromCache=true|false (ALPHA - default=false) ContainerCheckpoint=true|false (ALPHA - default=false) @@ -103,10 +101,10 @@ Feature gate flags: CronJobsScheduledAnnotation=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) - CustomResourceValidationExpressions=true|false (BETA - default=true) - DevicePluginCDIDevices=true|false (ALPHA - default=false) - DisableCloudProviders=true|false (ALPHA - default=false) - DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) + DevicePluginCDIDevices=true|false (BETA - default=true) + DisableCloudProviders=true|false (BETA - default=true) + DisableKubeletCloudCredentialProviders=true|false (BETA - default=true) + DisableNodeKubeProxyVersion=true|false (ALPHA - default=false) DynamicResourceAllocation=true|false (ALPHA - default=false) ElasticIndexedJob=true|false (BETA - default=true) EventedPLEG=true|false (BETA - default=false) @@ -115,6 +113,7 @@ Feature gate flags: HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) + ImageMaximumGCAge=true|false (ALPHA - default=false) InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) @@ -123,78 +122,89 @@ Feature gate flags: InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) InTreePluginPortworxUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) - JobBackoffLimitPerIndex=true|false (ALPHA - default=false) + JobBackoffLimitPerIndex=true|false (BETA - default=true) JobPodFailurePolicy=true|false (BETA - default=true) - JobPodReplacementPolicy=true|false (ALPHA - default=false) - JobReadyPods=true|false (BETA - default=true) - KMSv2=true|false (BETA - default=true) - KMSv2KDF=true|false (BETA - default=false) + JobPodReplacementPolicy=true|false (BETA - default=true) KubeProxyDrainingTerminatingNodes=true|false (ALPHA - default=false) KubeletCgroupDriverFromCRI=true|false (ALPHA - default=false) KubeletInUserNamespace=true|false (ALPHA - default=false) KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) KubeletPodResourcesGet=true|false (ALPHA - default=false) + KubeletSeparateDiskGC=true|false (ALPHA - default=false) KubeletTracing=true|false (BETA - default=true) - LegacyServiceAccountTokenCleanUp=true|false (ALPHA - default=false) + LegacyServiceAccountTokenCleanUp=true|false (BETA - default=true) + LoadBalancerIPMode=true|false (ALPHA - default=false) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) LoggingBetaOptions=true|false (BETA - default=true) + MatchLabelKeysInPodAffinity=true|false (ALPHA - default=false) MatchLabelKeysInPodTopologySpread=true|false (BETA - default=true) MaxUnavailableStatefulSet=true|false (ALPHA - default=false) MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) MinDomainsInPodTopologySpread=true|false (BETA - default=true) - MultiCIDRRangeAllocator=true|false (ALPHA - default=false) MultiCIDRServiceAllocator=true|false (ALPHA - default=false) + NFTablesProxyMode=true|false (ALPHA - default=false) NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) NodeLogQuery=true|false (ALPHA - default=false) NodeSwap=true|false (BETA - default=false) OpenAPIEnums=true|false (BETA - default=true) PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) - PersistentVolumeLastPhaseTransitionTime=true|false (ALPHA - default=false) + PersistentVolumeLastPhaseTransitionTime=true|false (BETA - default=true) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) - PodHostIPs=true|false (ALPHA - default=false) + PodHostIPs=true|false (BETA - default=true) PodIndexLabel=true|false (BETA - default=true) - PodReadyToStartContainersCondition=true|false (ALPHA - default=false) + PodLifecycleSleepAction=true|false (ALPHA - default=false) + PodReadyToStartContainersCondition=true|false (BETA - default=true) PodSchedulingReadiness=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) QOSReserved=true|false (ALPHA - default=false) - ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) - RemainingItemCount=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) + RuntimeClassInImageCriApi=true|false (ALPHA - default=false) SELinuxMountReadWriteOncePod=true|false (BETA - default=true) - SchedulerQueueingHints=true|false (BETA - default=true) + SchedulerQueueingHints=true|false (BETA - default=false) SecurityContextDeny=true|false (ALPHA - default=false) - ServiceNodePortStaticSubrange=true|false (BETA - default=true) - SidecarContainers=true|false (ALPHA - default=false) + SeparateTaintEvictionController=true|false (BETA - default=true) + ServiceAccountTokenJTI=true|false (ALPHA - default=false) + ServiceAccountTokenNodeBinding=true|false (ALPHA - default=false) + ServiceAccountTokenNodeBindingValidation=true|false (ALPHA - default=false) + ServiceAccountTokenPodNodeInfo=true|false (ALPHA - default=false) + SidecarContainers=true|false (BETA - default=true) SizeMemoryBackedVolumes=true|false (BETA - default=true) - SkipReadOnlyValidationGCE=true|false (ALPHA - default=false) StableLoadBalancerNodeSet=true|false (BETA - default=true) StatefulSetAutoDeletePVC=true|false (BETA - default=true) StatefulSetStartOrdinal=true|false (BETA - default=true) StorageVersionAPI=true|false (ALPHA - default=false) StorageVersionHash=true|false (BETA - default=true) + StructuredAuthenticationConfiguration=true|false (ALPHA - default=false) + StructuredAuthorizationConfiguration=true|false (ALPHA - default=false) TopologyAwareHints=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) TopologyManagerPolicyBetaOptions=true|false (BETA - default=true) TopologyManagerPolicyOptions=true|false (BETA - default=true) + TranslateStreamCloseWebsocketRequests=true|false (ALPHA - default=false) + UnauthenticatedHTTP2DOSMitigation=true|false (BETA - default=true) UnknownVersionInteroperabilityProxy=true|false (ALPHA - default=false) + UserNamespacesPodSecurityStandards=true|false (ALPHA - default=false) UserNamespacesSupport=true|false (ALPHA - default=false) ValidatingAdmissionPolicy=true|false (BETA - default=false) + VolumeAttributesClass=true|false (ALPHA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) WinOverlay=true|false (BETA - default=true) WindowsHostNetwork=true|false (ALPHA - default=true) + ZeroLimitedNominalConcurrencyShares=true|false (BETA - default=false) Metrics flags: --allow-metric-labels stringToString The map from metric-label to value allow-list of this label. The key's format is ,. The value's format is ,...e.g. metric1,label1='v1,v2,v3', metric1,label2='v1,v2,v3' metric2,label1='v1,v2,v3'. (default []) + --allow-metric-labels-manifest string The path to the manifest file that contains the allow-list mapping. The format of the file is the same as the flag --allow-metric-labels. Note that the flag --allow-metric-labels will override the manifest file. --disabled-metrics strings This flag provides an escape hatch for misbehaving metrics. You must provide the fully qualified metric name in order to disable it. Disclaimer: disabling metrics is higher in precedence than showing hidden metrics. --show-hidden-metrics-for-version string The previous version for which you want to show hidden metrics. Only the previous minor version is meaningful, other values will not be allowed. The format is ., e.g.: '1.16'. The purpose of this format is make sure you have the opportunity to notice if the next release hides additional metrics, rather than being surprised when they are permanently removed in the release after that. diff --git a/kubernetes/cli/kubelet.txt b/kubernetes/cli/kubelet.txt index 3167e89b3..5e7488c92 100644 --- a/kubernetes/cli/kubelet.txt +++ b/kubernetes/cli/kubelet.txt @@ -39,7 +39,7 @@ Flags: --cgroups-per-qos Enable creation of QoS cgroup hierarchy, if true top level QoS and pod cgroups are created. (default true) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --client-ca-file string If set, any request presenting a client certificate signed by one of the authorities in the client-ca-file is authenticated with an identity corresponding to the CommonName of the client certificate. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --cloud-config string The path to the cloud provider configuration file. Empty string for no configuration file. (DEPRECATED: will be removed in 1.25 or later, in favor of removing cloud provider code from Kubelet.) - --cloud-provider string The provider for cloud services. Set to empty string for running with no cloud provider. If set, the cloud provider determines the name of the node (consult cloud provider documentation to determine if and how the hostname is used). (DEPRECATED: will be removed in 1.25 or later, in favor of removing cloud provider code from Kubelet.) + --cloud-provider string The provider for cloud services. Set to empty string for running with no cloud provider. Set to 'external' for running with an external cloud provider. If set, the cloud provider determines the name of the node (consult cloud provider documentation to determine if and how the hostname is used). --cluster-dns strings Comma-separated list of DNS server IP address. This value is used for containers DNS server in case of Pods with "dnsPolicy=ClusterFirst". Note: all DNS servers appearing in the list MUST serve the same set of records otherwise name resolution within the cluster may not work correctly. There is no guarantee as to which DNS server may be contacted for name resolution. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --cluster-domain string Domain for this cluster. If set, kubelet will configure all containers to search this domain in addition to the host's search domains (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --config string The Kubelet will load its initial configuration from this file. The path may be absolute or relative; relative paths start at the Kubelet's current working directory. Omit this flag to use the built-in default configuration values. Command-line flags override configuration from this file. @@ -76,8 +76,6 @@ Flags: --experimental-mounter-path string [Experimental] Path of mounter binary. Leave empty to use the default mount. (DEPRECATED: will be removed in 1.25 or later. in favor of using CSI.) --fail-swap-on Makes the Kubelet fail to start if swap is enabled on the node. (default true) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --feature-gates mapStringBool A set of key=value pairs that describe feature gates for alpha/experimental features. Options are: - APIListChunking=true|false (BETA - default=true) - APIPriorityAndFairness=true|false (BETA - default=true) APIResponseCompression=true|false (BETA - default=true) APIServerIdentity=true|false (BETA - default=true) APIServerTracing=true|false (BETA - default=true) @@ -92,11 +90,11 @@ Flags: CPUManagerPolicyOptions=true|false (BETA - default=true) CRDValidationRatcheting=true|false (ALPHA - default=false) CSIMigrationPortworx=true|false (BETA - default=false) - CSINodeExpandSecret=true|false (BETA - default=true) CSIVolumeHealth=true|false (ALPHA - default=false) CloudControllerManagerWebhook=true|false (ALPHA - default=false) - CloudDualStackNodeIPs=true|false (ALPHA - default=false) + CloudDualStackNodeIPs=true|false (BETA - default=true) ClusterTrustBundle=true|false (ALPHA - default=false) + ClusterTrustBundleProjection=true|false (ALPHA - default=false) ComponentSLIs=true|false (BETA - default=true) ConsistentListFromCache=true|false (ALPHA - default=false) ContainerCheckpoint=true|false (ALPHA - default=false) @@ -104,10 +102,10 @@ Flags: CronJobsScheduledAnnotation=true|false (BETA - default=true) CrossNamespaceVolumeDataSource=true|false (ALPHA - default=false) CustomCPUCFSQuotaPeriod=true|false (ALPHA - default=false) - CustomResourceValidationExpressions=true|false (BETA - default=true) - DevicePluginCDIDevices=true|false (ALPHA - default=false) - DisableCloudProviders=true|false (ALPHA - default=false) - DisableKubeletCloudCredentialProviders=true|false (ALPHA - default=false) + DevicePluginCDIDevices=true|false (BETA - default=true) + DisableCloudProviders=true|false (BETA - default=true) + DisableKubeletCloudCredentialProviders=true|false (BETA - default=true) + DisableNodeKubeProxyVersion=true|false (ALPHA - default=false) DynamicResourceAllocation=true|false (ALPHA - default=false) ElasticIndexedJob=true|false (BETA - default=true) EventedPLEG=true|false (BETA - default=false) @@ -116,6 +114,7 @@ Flags: HPAContainerMetrics=true|false (BETA - default=true) HPAScaleToZero=true|false (ALPHA - default=false) HonorPVReclaimPolicy=true|false (ALPHA - default=false) + ImageMaximumGCAge=true|false (ALPHA - default=false) InPlacePodVerticalScaling=true|false (ALPHA - default=false) InTreePluginAWSUnregister=true|false (ALPHA - default=false) InTreePluginAzureDiskUnregister=true|false (ALPHA - default=false) @@ -124,74 +123,84 @@ Flags: InTreePluginOpenStackUnregister=true|false (ALPHA - default=false) InTreePluginPortworxUnregister=true|false (ALPHA - default=false) InTreePluginvSphereUnregister=true|false (ALPHA - default=false) - JobBackoffLimitPerIndex=true|false (ALPHA - default=false) + JobBackoffLimitPerIndex=true|false (BETA - default=true) JobPodFailurePolicy=true|false (BETA - default=true) - JobPodReplacementPolicy=true|false (ALPHA - default=false) - JobReadyPods=true|false (BETA - default=true) - KMSv2=true|false (BETA - default=true) - KMSv2KDF=true|false (BETA - default=false) + JobPodReplacementPolicy=true|false (BETA - default=true) KubeProxyDrainingTerminatingNodes=true|false (ALPHA - default=false) KubeletCgroupDriverFromCRI=true|false (ALPHA - default=false) KubeletInUserNamespace=true|false (ALPHA - default=false) KubeletPodResourcesDynamicResources=true|false (ALPHA - default=false) KubeletPodResourcesGet=true|false (ALPHA - default=false) + KubeletSeparateDiskGC=true|false (ALPHA - default=false) KubeletTracing=true|false (BETA - default=true) - LegacyServiceAccountTokenCleanUp=true|false (ALPHA - default=false) + LegacyServiceAccountTokenCleanUp=true|false (BETA - default=true) + LoadBalancerIPMode=true|false (ALPHA - default=false) LocalStorageCapacityIsolationFSQuotaMonitoring=true|false (ALPHA - default=false) LogarithmicScaleDown=true|false (BETA - default=true) LoggingAlphaOptions=true|false (ALPHA - default=false) LoggingBetaOptions=true|false (BETA - default=true) + MatchLabelKeysInPodAffinity=true|false (ALPHA - default=false) MatchLabelKeysInPodTopologySpread=true|false (BETA - default=true) MaxUnavailableStatefulSet=true|false (ALPHA - default=false) MemoryManager=true|false (BETA - default=true) MemoryQoS=true|false (ALPHA - default=false) MinDomainsInPodTopologySpread=true|false (BETA - default=true) - MultiCIDRRangeAllocator=true|false (ALPHA - default=false) MultiCIDRServiceAllocator=true|false (ALPHA - default=false) + NFTablesProxyMode=true|false (ALPHA - default=false) NewVolumeManagerReconstruction=true|false (BETA - default=true) NodeInclusionPolicyInPodTopologySpread=true|false (BETA - default=true) NodeLogQuery=true|false (ALPHA - default=false) NodeSwap=true|false (BETA - default=false) OpenAPIEnums=true|false (BETA - default=true) PDBUnhealthyPodEvictionPolicy=true|false (BETA - default=true) - PersistentVolumeLastPhaseTransitionTime=true|false (ALPHA - default=false) + PersistentVolumeLastPhaseTransitionTime=true|false (BETA - default=true) PodAndContainerStatsFromCRI=true|false (ALPHA - default=false) PodDeletionCost=true|false (BETA - default=true) PodDisruptionConditions=true|false (BETA - default=true) - PodHostIPs=true|false (ALPHA - default=false) + PodHostIPs=true|false (BETA - default=true) PodIndexLabel=true|false (BETA - default=true) - PodReadyToStartContainersCondition=true|false (ALPHA - default=false) + PodLifecycleSleepAction=true|false (ALPHA - default=false) + PodReadyToStartContainersCondition=true|false (BETA - default=true) PodSchedulingReadiness=true|false (BETA - default=true) ProcMountType=true|false (ALPHA - default=false) QOSReserved=true|false (ALPHA - default=false) - ReadWriteOncePod=true|false (BETA - default=true) RecoverVolumeExpansionFailure=true|false (ALPHA - default=false) - RemainingItemCount=true|false (BETA - default=true) RotateKubeletServerCertificate=true|false (BETA - default=true) + RuntimeClassInImageCriApi=true|false (ALPHA - default=false) SELinuxMountReadWriteOncePod=true|false (BETA - default=true) - SchedulerQueueingHints=true|false (BETA - default=true) + SchedulerQueueingHints=true|false (BETA - default=false) SecurityContextDeny=true|false (ALPHA - default=false) - ServiceNodePortStaticSubrange=true|false (BETA - default=true) - SidecarContainers=true|false (ALPHA - default=false) + SeparateTaintEvictionController=true|false (BETA - default=true) + ServiceAccountTokenJTI=true|false (ALPHA - default=false) + ServiceAccountTokenNodeBinding=true|false (ALPHA - default=false) + ServiceAccountTokenNodeBindingValidation=true|false (ALPHA - default=false) + ServiceAccountTokenPodNodeInfo=true|false (ALPHA - default=false) + SidecarContainers=true|false (BETA - default=true) SizeMemoryBackedVolumes=true|false (BETA - default=true) - SkipReadOnlyValidationGCE=true|false (ALPHA - default=false) StableLoadBalancerNodeSet=true|false (BETA - default=true) StatefulSetAutoDeletePVC=true|false (BETA - default=true) StatefulSetStartOrdinal=true|false (BETA - default=true) StorageVersionAPI=true|false (ALPHA - default=false) StorageVersionHash=true|false (BETA - default=true) + StructuredAuthenticationConfiguration=true|false (ALPHA - default=false) + StructuredAuthorizationConfiguration=true|false (ALPHA - default=false) TopologyAwareHints=true|false (BETA - default=true) TopologyManagerPolicyAlphaOptions=true|false (ALPHA - default=false) TopologyManagerPolicyBetaOptions=true|false (BETA - default=true) TopologyManagerPolicyOptions=true|false (BETA - default=true) + TranslateStreamCloseWebsocketRequests=true|false (ALPHA - default=false) + UnauthenticatedHTTP2DOSMitigation=true|false (BETA - default=true) UnknownVersionInteroperabilityProxy=true|false (ALPHA - default=false) + UserNamespacesPodSecurityStandards=true|false (ALPHA - default=false) UserNamespacesSupport=true|false (ALPHA - default=false) ValidatingAdmissionPolicy=true|false (BETA - default=false) + VolumeAttributesClass=true|false (ALPHA - default=false) VolumeCapacityPriority=true|false (ALPHA - default=false) WatchList=true|false (ALPHA - default=false) WinDSR=true|false (ALPHA - default=false) WinOverlay=true|false (BETA - default=true) - WindowsHostNetwork=true|false (ALPHA - default=true) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) + WindowsHostNetwork=true|false (ALPHA - default=true) + ZeroLimitedNominalConcurrencyShares=true|false (BETA - default=false) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --file-check-frequency duration Duration between checking config files for new data (default 20s) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) --global-housekeeping-interval duration Interval between global housekeepings (default 1m0s) (DEPRECATED: This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed.) --hairpin-mode string How should the kubelet setup hairpin NAT. This allows endpoints of a Service to loadbalance back to themselves if they should try to access their own Service. Valid values are "promiscuous-bridge", "hairpin-veth" and "none". (default "promiscuous-bridge") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.) From d9c79f161a39b39bbe32b339462648b4e2f4c1fd Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 17 Feb 2024 18:50:47 +0800 Subject: [PATCH 38/42] [23.11] init v23.11 Signed-off-by: Kang Huaishuai --- .appveyor.yml | 4 +-- .env.example | 6 ++-- .env.example.ps1 | 3 +- .../setup-lnmp/.github/workflows/ci.yaml | 2 +- .github/actions/setup-lnmp/action.yml | 2 +- .../setup-php/.github/workflows/ci.yaml | 2 +- .github/actions/setup-php/action.yml | 2 +- .github/actions/setup-php/package.json | 2 +- .github/workflows/build-docs.yml | 2 +- .github/workflows/lwpm-dist-file.yaml | 4 +-- .github/workflows/release.yaml | 4 +-- .github/workflows/sync-actions.yml | 2 +- .github/workflows/sync-git.yml | 2 +- .github/workflows/sync-php.yml | 4 +-- .pcit.yml | 5 +-- CHANGELOG.md | 6 ++-- CONTRIBUTING.md | 10 +++--- README.cn.md | 18 +++++----- README.md | 20 +++++------ app/demo/.drone.yml | 12 +++---- app/demo/.env.example | 2 +- app/demo/.pcit.yml | 6 ++-- app/demo/Dockerfile | 4 +-- app/demo/deploy/test.Dockerfile | 2 +- app/demo/docker-compose.yml | 6 ++-- app/demo/docker-workspace.yml | 4 +-- .../.github/workflows/ci-cdn.yaml | 4 +-- app/laravel-demo/.github/workflows/ci.yaml | 4 +-- app/laravel-demo/Dockerfile | 4 +-- app/laravel-demo/Dockerfile.buildkit | 4 +-- app/laravel-demo/Dockerfile.cdn | 4 +-- docker-lnmp.override.example.yml | 8 ++--- docker-lnmp.yml | 4 +-- docker-production.yml | 4 +-- docker-workspace.example.yml | 4 +-- dockerfile/php/sync/Dockerfile | 4 +-- dockerfile/php/sync/Jenkinsfile | 4 +-- dockerfile/php/sync/docker-image-sync.json | 36 +++++++++---------- dockerfile/php/sync/manifest.txt | 6 ++++ dockerfile/sync/Dockerfile | 6 ++-- dockerfile/sync/Jenkinsfile | 4 +-- docs/custom.md | 4 +-- kubernetes/.github/workflows/setup-k8s.yaml | 2 +- .../kubernetes-release/sync/Jenkinsfile | 6 ++-- kubernetes/lnmp/php/base/lnmp-php.yaml | 2 +- lnmp-docker.ps1 | 2 +- lrew/nginx-unit/docker-compose.yml | 2 +- renovate.json | 2 +- scripts/docker-compose.bump.yml | 2 +- vscode-remote/docker-workspace.yml | 4 +-- windows/lnmp-windows-pm-repo/php/lwpm.json | 4 +-- windows/lnmp-windows-pm-repo/php/lwpm.yaml | 4 +-- wsl/Dockerfile | 2 +- wsl/lnmp-wsl-builder-php | 2 +- wsl/lnmp-wsl-builder-php-rhel | 2 +- wsl/wsl.phpbuilder.Dockerfile | 2 +- wsl/wsl.phpbuilder.rhel.Dockerfile | 2 +- 57 files changed, 145 insertions(+), 135 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index f4e2a211b..fe34f92cc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,9 +4,9 @@ image: Visual Studio 2019 branches: only: # - windows - # - /^20.10$/ + # - /^23.11$/ - master - - "20.10" + - "23.11" # - /v*/ # skip_non_tags: true diff --git a/.env.example b/.env.example index 30100c20e..20e354413 100644 --- a/.env.example +++ b/.env.example @@ -123,7 +123,8 @@ LNMP_NGINX_VERSION=1.25.3 LNMP_MYSQL_VERSION=8.0.33 -LNMP_PHP_VERSION=8.2.13 +# latest php version +LNMP_PHP_VERSION=8.3.0 # LNMP_PHP_VERSION=nightly # PHP EOL VERSION @@ -137,7 +138,8 @@ LNMP_PHP73_VERSION=7.3.33 LNMP_PHP74_VERSION=7.4.33 # PHP EOL VERSION END -LNMP_PHP8_VERSION=8.2.13 +# latest php version +LNMP_PHP8_VERSION=8.3.0 LNMP_PHP80_VERSION=8.0.30 LNMP_PHP81_VERSION=8.1.26 LNMP_PHP82_VERSION=8.2.13 diff --git a/.env.example.ps1 b/.env.example.ps1 index e001b666d..1e4f2f529 100644 --- a/.env.example.ps1 +++ b/.env.example.ps1 @@ -7,7 +7,8 @@ $CI_HOST="ci.khs1994.com:1218" # $ wsl -l $DistributionName="Ubuntu-22.04" -$LNMP_PHP_IMAGE="khs1994/php:8.2.13-composer-alpine" +# latest php version +$LNMP_PHP_IMAGE="khs1994/php:8.3.0-composer-alpine" $NGINX_PATH="C:/nginx" $PHP_PATH="C:/php" diff --git a/.github/actions/setup-lnmp/.github/workflows/ci.yaml b/.github/actions/setup-lnmp/.github/workflows/ci.yaml index 083ed2210..636fc6125 100644 --- a/.github/actions/setup-lnmp/.github/workflows/ci.yaml +++ b/.github/actions/setup-lnmp/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: matrix: lnmp_branch: - 19.03 - - "20.10" + - "23.11" - master runs-on: ubuntu-latest steps: diff --git a/.github/actions/setup-lnmp/action.yml b/.github/actions/setup-lnmp/action.yml index 9e48bbe2d..41a09e3b4 100644 --- a/.github/actions/setup-lnmp/action.yml +++ b/.github/actions/setup-lnmp/action.yml @@ -6,7 +6,7 @@ author: 'khs1994' inputs: lnmp_branch: description: lnmp branch - default: "20.10" + default: "23.11" required: false lnmp_services: description: lnmp services diff --git a/.github/actions/setup-php/.github/workflows/ci.yaml b/.github/actions/setup-php/.github/workflows/ci.yaml index 549794e25..35a69f697 100644 --- a/.github/actions/setup-php/.github/workflows/ci.yaml +++ b/.github/actions/setup-php/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: matrix: php_version: - nightly - - 8.2.13 + - 8.3.0 - 8.1.26 - 8.0.30 # EOL diff --git a/.github/actions/setup-php/action.yml b/.github/actions/setup-php/action.yml index f8682ad7c..47b3e360a 100644 --- a/.github/actions/setup-php/action.yml +++ b/.github/actions/setup-php/action.yml @@ -6,7 +6,7 @@ author: 'khs1994' inputs: php_version: description: PHP version - default: "8.2.13" + default: "8.3.0" required: false php_type: description: php image type, fpm | composer | swoole | php-cs-fixer | doctum diff --git a/.github/actions/setup-php/package.json b/.github/actions/setup-php/package.json index 54c658aec..3f6757866 100644 --- a/.github/actions/setup-php/package.json +++ b/.github/actions/setup-php/package.json @@ -12,7 +12,7 @@ }, "devDependencies": {}, "scripts": { - "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.2.13' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" + "test": "cross-env RUNNER_WORKSPACE='/home/runner/work/php-demo' INPUT_ARGS=\"php -v ; env\" INPUT_PHP_VERSION='8.3.0' INPUT_PHP_TYPE=composer INPUT_JOB_CONTAINER_NETWORK=test node lib/setup-php" }, "author": "", "license": "ISC" diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index eb301c784..ac028b0f4 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -10,7 +10,7 @@ on: tags: - '*' branches: - - "20.10" + - "23.11" workflow_dispatch: name: Build Docs diff --git a/.github/workflows/lwpm-dist-file.yaml b/.github/workflows/lwpm-dist-file.yaml index 6f428617c..bddf889d2 100644 --- a/.github/workflows/lwpm-dist-file.yaml +++ b/.github/workflows/lwpm-dist-file.yaml @@ -3,7 +3,7 @@ name: LWPM Dist File on: push: branches: - - "20.10" + - "23.11" workflow_dispatch: jobs: @@ -26,7 +26,7 @@ jobs: with: repository: khs1994-docker/lnmp fetch-depth: 1 - # ref: "20.10" + # ref: "23.11" path: lnmp - name: handle-conmon shell: pwsh diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b5dfbcfae..a5184cec2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,7 +1,7 @@ on: push: tags: - - v20.10.* + - v23.11.* workflow_dispatch: name: Release @@ -93,7 +93,7 @@ jobs: fi export GITHUB_TAG=$(echo $GITHUB_REF | cut -d '/' -f 3) - gh release create $GITHUB_TAG -F CHANGELOG.md --target 20.10 -t $GITHUB_TAG || true + gh release create $GITHUB_TAG -F CHANGELOG.md --target 23.11 -t $GITHUB_TAG || true # deb sh scripts/cli/build.sh deb ${GITHUB_TAG} diff --git a/.github/workflows/sync-actions.yml b/.github/workflows/sync-actions.yml index 907563e8f..c003e2a7a 100644 --- a/.github/workflows/sync-actions.yml +++ b/.github/workflows/sync-actions.yml @@ -3,7 +3,7 @@ on: tags: - '*' branches: - - "20.10" + - "23.11" # paths: # - '/.github/actions/*' workflow_dispatch: diff --git a/.github/workflows/sync-git.yml b/.github/workflows/sync-git.yml index 1d4e438cf..0394aea01 100644 --- a/.github/workflows/sync-git.yml +++ b/.github/workflows/sync-git.yml @@ -5,7 +5,7 @@ on: tags: - '*' branches: - - "20.10" + - "23.11" workflow_dispatch: name: Sync Git diff --git a/.github/workflows/sync-php.yml b/.github/workflows/sync-php.yml index 39f0c7058..8759fdf68 100644 --- a/.github/workflows/sync-php.yml +++ b/.github/workflows/sync-php.yml @@ -5,7 +5,7 @@ on: # - '*' # Sequence of patterns matched against refs/heads branches: - - 20.10-pre + - 23.11-pre # - 'releases/*' # Push events to branches matching refs/heads/releases/* workflow_dispatch: @@ -15,7 +15,7 @@ jobs: sync-php: runs-on: ubuntu-latest if: | - github.ref == 'refs/heads/20.10-pre' + github.ref == 'refs/heads/23.11-pre' steps: - uses: actions/checkout@main with: diff --git a/.pcit.yml b/.pcit.yml index 9f3052b18..9bd51ec58 100644 --- a/.pcit.yml +++ b/.pcit.yml @@ -4,7 +4,8 @@ workspace: steps: bash: - image: khs1994/php:8.2.13-composer-alpine + # latest php version + image: khs1994/php:8.3.0-composer-alpine run: - pwd - bash ./lnmp-docker @@ -18,4 +19,4 @@ steps: branches: - master -- "20.10" +- "23.11" diff --git a/CHANGELOG.md b/CHANGELOG.md index f617b32c4..b2cf0d39b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Changelog -## v20.10.30 +## v23.11.0 ### Compare -* https://github.com/khs1994-docker/lnmp/compare/v20.10.29...20.10 +* https://github.com/khs1994-docker/lnmp/compare/v20.10.30...23.11 ### Bug fixes: @@ -12,4 +12,4 @@ ### Updates: -* [PHP `8.2.13` `8.1.26` `8.0.30`](https://www.php.net/ChangeLog-8.php#8.1.26) +* [PHP `8.3.0` `8.2.13` `8.1.26`](https://www.php.net/ChangeLog-8.php#8.1.26) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dac265286..ba53a4b2c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ * 在 [GitHub](https://github.com/khs1994-docker/lnmp/fork) 上点击 `fork` 按钮将本仓库 fork 到自己的仓库，如 `yourname/lnmp`，然后 `clone` 到本地。 ```bash - $ git clone -b 20.10 git@github.com:yourname/lnmp.git + $ git clone -b 23.11 git@github.com:yourname/lnmp.git $ cd lnmp @@ -21,17 +21,17 @@ $ git commit -a "Fix issue #1: change helo to hello" - $ git push origin 20.10 + $ git push origin 23.11 ``` -* 在 [GitHub](https://github.com/khs1994-docker/lnmp) 上提交 `Pull request`，注意请提交到 YY.MM(例如: `20.10`) 分支。 +* 在 [GitHub](https://github.com/khs1994-docker/lnmp) 上提交 `Pull request`，注意请提交到 YY.MM(例如: `23.11`) 分支。 * 请定期更新自己仓库。 ```bash $ git fetch upstream - $ git rebase upstream/20.10 + $ git rebase upstream/23.11 - $ git push -f origin 20.10 + $ git push -f origin 23.11 ``` diff --git a/README.cn.md b/README.cn.md index 5fa1b4138..d5edd94d1 100644 --- a/README.cn.md +++ b/README.cn.md @@ -9,7 +9,7 @@ LNMP_DOCKER_IMAGE_PREFIX=pcit-docker.pkg.coding.net/khs1994-docker/khs1994 LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror ``` -[![GitHub stars](https://img.shields.io/github/stars/khs1994-docker/lnmp.svg?style=social&label=Stars)](https://github.com/khs1994-docker/lnmp) [![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)](https://github.com/khs1994-docker/lnmp/releases) [![license](https://img.shields.io/github/license/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp) [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) +[![GitHub stars](https://img.shields.io/github/stars/khs1994-docker/lnmp.svg?style=social&label=Stars)](https://github.com/khs1994-docker/lnmp) [![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)](https://github.com/khs1994-docker/lnmp/releases) [![license](https://img.shields.io/github/license/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp) [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=23.11)](https://ci.khs1994.com/github/khs1994-docker/lnmp) [![star](https://gitee.com/khs1994-docker/lnmp/badge/star.svg?theme=dark)](https://gitee.com/khs1994-docker/lnmp/stargazers) @@ -19,9 +19,9 @@ LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror | Platform | Status | | -- | -- | -| Windows | [![Build status](https://ci.appveyor.com/api/projects/status/itgp61n808n80b8m/branch/20.10?svg=true)](https://ci.appveyor.com/project/khs1994-docker/lnmp/branch/20.10) | -| Linux | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) | -| macOS | ![CI](https://github.com/khs1994-docker/lnmp/workflows/CI/badge.svg?branch=20.10) | +| Windows | [![Build status](https://ci.appveyor.com/api/projects/status/itgp61n808n80b8m/branch/23.11?svg=true)](https://ci.appveyor.com/project/khs1994-docker/lnmp/branch/23.11) | +| Linux | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=23.11)](https://ci.khs1994.com/github/khs1994-docker/lnmp) | +| macOS | ![CI](https://github.com/khs1994-docker/lnmp/workflows/CI/badge.svg?branch=23.11) | | Linux arm64v8 | - |

@@ -66,7 +66,7 @@ LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror :one: [Git](https://mirrors.huaweicloud.com/git-for-windows/) -:two: [Docker](https://github.com/yeasy/docker_practice/tree/master/install) 20.10 Stable + +:two: [Docker](https://github.com/yeasy/docker_practice/tree/master/install) 23.11 Stable + :three: [Docker Compose v2.17.0+](https://github.com/yeasy/docker_practice/blob/master/compose/install.md) @@ -103,7 +103,7 @@ $ ./lnmp-docker up $ curl 127.0.0.1 -Welcome use khs1994-docker/lnmp v20.10 x86_64 With Pull Docker Image +Welcome use khs1994-docker/lnmp v23.11 x86_64 With Pull Docker Image development @@ -211,13 +211,13 @@ $ ./lnmp-docker down |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.3-alpine` | **1.25.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.13-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.3.0-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.5` | **10.11.5** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.13-fpm-alpine` | **8.2.13** |`alpine:3.19` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.13-composer-alpine`| **2.5.8** |`alpine:3.19` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.3.0-fpm-alpine` | **8.3.0** |`alpine:3.19` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.3.0-composer-alpine`| **2.5.8** |`alpine:3.19` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/README.md b/README.md index 95d097fe2..42aaad91d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ LNMP_DOCKER_IMAGE_PREFIX=pcit-docker.pkg.coding.net/khs1994-docker/khs1994 LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror ``` -[![GitHub stars](https://img.shields.io/github/stars/khs1994-docker/lnmp.svg?style=social&label=Stars)](https://github.com/khs1994-docker/lnmp) [![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)](https://github.com/khs1994-docker/lnmp/releases) [![license](https://img.shields.io/github/license/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp) [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) +[![GitHub stars](https://img.shields.io/github/stars/khs1994-docker/lnmp.svg?style=social&label=Stars)](https://github.com/khs1994-docker/lnmp) [![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)](https://github.com/khs1994-docker/lnmp/releases) [![license](https://img.shields.io/github/license/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp) [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=23.11)](https://ci.khs1994.com/github/khs1994-docker/lnmp) [![star](https://gitee.com/khs1994-docker/lnmp/badge/star.svg?theme=dark)](https://gitee.com/khs1994-docker/lnmp/stargazers) @@ -17,10 +17,10 @@ LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror | Platform | Status | | -- | -- | -| Windows | [![Build status](https://ci.appveyor.com/api/projects/status/itgp61n808n80b8m/branch/20.10?svg=true)](https://ci.appveyor.com/project/khs1994-docker/lnmp/branch/20.10) | -| Linux | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) | -| macOS | ![CI](https://github.com/khs1994-docker/lnmp/workflows/CI/badge.svg?branch=20.10) | -| Linux arm64v8 | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=20.10)](https://ci.khs1994.com/github/khs1994-docker/lnmp) | +| Windows | [![Build status](https://ci.appveyor.com/api/projects/status/itgp61n808n80b8m/branch/23.11?svg=true)](https://ci.appveyor.com/project/khs1994-docker/lnmp/branch/23.11) | +| Linux | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=23.11)](https://ci.khs1994.com/github/khs1994-docker/lnmp) | +| macOS | ![CI](https://github.com/khs1994-docker/lnmp/workflows/CI/badge.svg?branch=23.11) | +| Linux arm64v8 | [![Build Status](https://ci.khs1994.com/github/khs1994-docker/lnmp/status?branch=23.11)](https://ci.khs1994.com/github/khs1994-docker/lnmp) |

@@ -64,7 +64,7 @@ To use LNMP Docker, you need: :one: [Git](https://git-scm.com/downloads) -:two: [Docker](https://github.com/yeasy/docker_practice/tree/master/install) 20.10 Stable + +:two: [Docker](https://github.com/yeasy/docker_practice/tree/master/install) 23.11 Stable + :three: [Docker Compose v2.17.0+](https://github.com/yeasy/docker_practice/blob/master/compose/install.md) @@ -101,7 +101,7 @@ $ ./lnmp-docker up $ curl 127.0.0.1 -Welcome use khs1994-docker/lnmp v20.10 x86_64 With Pull Docker Image +Welcome use khs1994-docker/lnmp v23.11 x86_64 With Pull Docker Image development @@ -206,13 +206,13 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:3.0.0` | **3.0.0** |`alpine:3.16` | |[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.25.3-alpine` | **1.25.3** |`alpine:3.13` | -|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.2.13-unit-alpine`| **1.30.0** |`alpine:3.16` | +|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:8.3.0-unit-alpine`| **1.30.0** |`alpine:3.16` | |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.53-alpine` | **2.4.53** |`alpine:3.16` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.33` | **8.0.33** |`oraclelinux:8-slim`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.11.5` | **10.11.5** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | -|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.2.13-fpm-alpine` | **8.2.13** |`alpine:3.19` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.2.13-composer-alpine`| **2.5.8** |`alpine:3.19` | +|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.3.0-fpm-alpine` | **8.3.0** |`alpine:3.19` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.3.0-composer-alpine`| **2.5.8** |`alpine:3.19` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/app/demo/.drone.yml b/app/demo/.drone.yml index 57e34c629..4bbc0e4d4 100644 --- a/app/demo/.drone.yml +++ b/app/demo/.drone.yml @@ -34,7 +34,7 @@ steps: # install dep - name: install # image: composer:2.5.8 - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine commands: - pwd - composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/ @@ -46,7 +46,7 @@ steps: # test script - name: script - image: khs1994/php:8.2.13-fpm-alpine + image: khs1994/php:8.3.0-fpm-alpine # pull: always | never | if-not-exists # detach: true # privileged: true @@ -92,7 +92,7 @@ steps: settings: # registry: docker.khs1994.com repo: khs1994/php - tags: 8.2.13-pro-${DRONE_TAG}-alpine + tags: 8.3.0-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com # build_args: @@ -142,7 +142,7 @@ steps: image: plugins/docker settings: repo: khs1994/php - tags: 8.2.13-pro-${DRONE_TAG}-alpine + tags: 8.3.0-pro-${DRONE_TAG}-alpine target: php mirror: https://hub-mirror.c.163.com username: @@ -179,7 +179,7 @@ steps: event: [ tag ] - name: after_success - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine when: status: success commands: @@ -228,7 +228,7 @@ volumes: # COMPOSER_VERSION: # - 2.5.8 # PHP_VERSION: -# - 8.2.13 +# - 8.3.0 # - 8.1.26 # - 8.0.30 # # - 7.4.33 diff --git a/app/demo/.env.example b/app/demo/.env.example index 9cd42d89f..f7c2ac969 100644 --- a/app/demo/.env.example +++ b/app/demo/.env.example @@ -1,6 +1,6 @@ DOCKER_HUB_USERNAME=khs1994 -PHP_VERSION=8.2.13 +PHP_VERSION=8.3.0 # PHP_VERSION=8.1.26 # PHP_VERSION=8.0.30 # PHP_VERSION=7.4.33 diff --git a/app/demo/.pcit.yml b/app/demo/.pcit.yml index 30f6fb5fc..43b3fe148 100644 --- a/app/demo/.pcit.yml +++ b/app/demo/.pcit.yml @@ -16,7 +16,7 @@ steps: # install dep install: # image: composer:${COMPOSER_VERSION} - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine shell: bash run: - pwd @@ -80,7 +80,7 @@ steps: event: tag after_success: - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine shell: bash if: status: success @@ -129,7 +129,7 @@ jobs: COMPOSER_VERSION: - 2.5.8 PHP_VERSION: - - 8.2.13 + - 8.3.0 - 8.1.26 - 8.0.30 # - 7.4.33 diff --git a/app/demo/Dockerfile b/app/demo/Dockerfile index 671688ea5..37e882b69 100644 --- a/app/demo/Dockerfile +++ b/app/demo/Dockerfile @@ -9,7 +9,7 @@ # !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !! ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG NGINX_VERSION=1.15.0 ARG DOCKER_HUB_USERNAME=khs1994 @@ -28,7 +28,7 @@ RUN cd /app \ --no-plugins # 2.将项目打入 PHP 镜像 -# $ docker build -t khs1994/php:8.2.13-pro-GIT_TAG-alpine --target=php . +# $ docker build -t khs1994/php:8.3.0-pro-GIT_TAG-alpine --target=php . FROM ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION}-fpm-alpine as php diff --git a/app/demo/deploy/test.Dockerfile b/app/demo/deploy/test.Dockerfile index 821d30408..03cc38de7 100644 --- a/app/demo/deploy/test.Dockerfile +++ b/app/demo/deploy/test.Dockerfile @@ -2,7 +2,7 @@ # TEST PHP PROJECT BY Docker # -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG GIT_REPO={{ EXAMPLE_GIT_URL_EXAMPLE }}/{{ EXAMPLE_GIT_USERNAME_EXAMPLE }}/{{ EXAMPLE_GIT_REPO_EXAMPLE }}.git FROM khs1994/php:${PHP_VERSION}-composer-alpine diff --git a/app/demo/docker-compose.yml b/app/demo/docker-compose.yml index 7d95638dc..540d64e51 100644 --- a/app/demo/docker-compose.yml +++ b/app/demo/docker-compose.yml @@ -19,7 +19,7 @@ services: context: . dockerfile: deploy/test.Dockerfile args: - - PHP_VERSION=${PHP_VERSION:-8.2.13} + - PHP_VERSION=${PHP_VERSION:-8.3.0} image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE nginx: @@ -39,7 +39,7 @@ services: dockerfile: Dockerfile target: php args: - - PHP_VERSION=${PHP_VERSION:-8.2.13} + - PHP_VERSION=${PHP_VERSION:-8.3.0} - NODE_VERSION=${NODE_VERSION:-20.5.1} - NODE_REGISTRY=https://registry.npmmirror.com - image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.13}-pro-alpine + image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.3.0}-pro-alpine diff --git a/app/demo/docker-workspace.yml b/app/demo/docker-workspace.yml index 80c1fb616..f9811af10 100644 --- a/app/demo/docker-workspace.yml +++ b/app/demo/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine networks: - backend volumes: @@ -67,7 +67,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.13-composer-alpine" + image: "khs1994/php:8.3.0-composer-alpine" command: [] # install | update npm: diff --git a/app/laravel-demo/.github/workflows/ci-cdn.yaml b/app/laravel-demo/.github/workflows/ci-cdn.yaml index bef98ee2f..83ad979c1 100644 --- a/app/laravel-demo/.github/workflows/ci-cdn.yaml +++ b/app/laravel-demo/.github/workflows/ci-cdn.yaml @@ -26,10 +26,10 @@ jobs: - uses: docker-practice/actions-setup-docker@master with: docker_channel: test - docker_version: "20.10" + docker_version: "23.11" - uses: khs1994-docker/actions-setup-lnmp@master with: - lnmp_branch: "20.10" + lnmp_branch: "23.11" lnmp_services: "nginx mysql php8 redis minio" lrew_include: "minio" - name: Init LNMP diff --git a/app/laravel-demo/.github/workflows/ci.yaml b/app/laravel-demo/.github/workflows/ci.yaml index a4913d67d..0628da9a0 100644 --- a/app/laravel-demo/.github/workflows/ci.yaml +++ b/app/laravel-demo/.github/workflows/ci.yaml @@ -30,10 +30,10 @@ jobs: - uses: docker-practice/actions-setup-docker@master with: docker_channel: test - docker_version: "20.10" + docker_version: "23.11" - uses: khs1994-docker/actions-setup-lnmp@master with: - lnmp_branch: "20.10" + lnmp_branch: "23.11" lnmp_services: "laravel nginx mysql php8 redis" lrew_include: "laravel" - name: Init LNMP diff --git a/app/laravel-demo/Dockerfile b/app/laravel-demo/Dockerfile index 1cb44e0da..f99e0a8d0 100644 --- a/app/laravel-demo/Dockerfile +++ b/app/laravel-demo/Dockerfile @@ -14,12 +14,12 @@ # $ docker build --target=laravel -t khs1994/laravel:10 --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.3.0-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.buildkit b/app/laravel-demo/Dockerfile.buildkit index 91847b449..6d86901d5 100644 --- a/app/laravel-demo/Dockerfile.buildkit +++ b/app/laravel-demo/Dockerfile.buildkit @@ -16,12 +16,12 @@ # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.buildkit --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . ARG NODE_VERSION=20.5.1 -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.3.0-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY --link composer.json /app/ diff --git a/app/laravel-demo/Dockerfile.cdn b/app/laravel-demo/Dockerfile.cdn index 36bbed815..9824b9d80 100644 --- a/app/laravel-demo/Dockerfile.cdn +++ b/app/laravel-demo/Dockerfile.cdn @@ -15,12 +15,12 @@ # # $ docker buildx build --target=laravel --load -t khs1994/laravel:10 -f Dockerfile.cdn --build-arg NODE_REGISTRY=https://registry.npmmirror.com --build-arg CI=false . -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG NGINX_VERSION=1.25.3-alpine ARG DOCKER_HUB_USERNAME=khs1994 # 2.安装 composer 依赖 -FROM ${DOCKER_HUB_USERNAME}/php:8.2.13-composer-alpine as composer +FROM ${DOCKER_HUB_USERNAME}/php:8.3.0-composer-alpine as composer # COPY composer.json composer.lock /app/ COPY composer.json /app/ diff --git a/docker-lnmp.override.example.yml b/docker-lnmp.override.example.yml index ffadb1398..17d591152 100644 --- a/docker-lnmp.override.example.yml +++ b/docker-lnmp.override.example.yml @@ -27,11 +27,11 @@ services: # php8: # &php8 # # ! change php8 default image - # image: username/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine + # image: username/php:${LNMP_PHP8_VERSION:-8.3.0}-fpm-alpine # # ! cn mirror image - # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine + # # image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP8_VERSION:-8.3.0}-fpm-alpine # # ! s6 - # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.13}-s6-alpine + # # image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.3.0}-s6-alpine # # command: [] # # ! open more port # ports: @@ -74,7 +74,7 @@ services: swoole: << : *common - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-swoole-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.3.0}-swoole-alpine # command 指令只需传入文件名即可 command: - /app/swoole/index.php diff --git a/docker-lnmp.yml b/docker-lnmp.yml index 48f3a6122..0d728675a 100644 --- a/docker-lnmp.yml +++ b/docker-lnmp.yml @@ -169,7 +169,7 @@ services: php8: &php8 << : [*common,*common-labels] - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.2.13}-fpm-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP8_VERSION:-8.3.0}-fpm-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} @@ -220,7 +220,7 @@ services: composer: << : [*common,*common-labels] restart: "no" - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.3.0}-composer-alpine" volumes: - *bind_app # - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app} diff --git a/docker-production.yml b/docker-production.yml index b3f40f3da..cb82dba2e 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -74,7 +74,7 @@ x-build-debian: x-php-common: &default-php - image: khs1994/php:8.2.13-fpm-alpine + image: khs1994/php:8.3.0-fpm-alpine volumes: - ./app:/app - type: volume @@ -364,7 +364,7 @@ services: - *common - *default-labels - *default-php - # image: khs1994/php:8.2.13-s6-alpine + # image: khs1994/php:8.3.0-s6-alpine # entrypoint: # - /s6-init build: diff --git a/docker-workspace.example.yml b/docker-workspace.example.yml index 7ad68ab1b..1db925de3 100644 --- a/docker-workspace.example.yml +++ b/docker-workspace.example.yml @@ -11,7 +11,7 @@ x-common: services: workspace: &workspace - image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine + image: ${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.3.0}-composer-alpine networks: - backend volumes: @@ -71,7 +71,7 @@ services: << : - *workspace - *common - image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.2.13}-composer-alpine" + image: "${LNMP_DOCKER_IMAGE_PREFIX:-khs1994}/php:${LNMP_PHP_VERSION:-8.3.0}-composer-alpine" command: [] # install | update npm: diff --git a/dockerfile/php/sync/Dockerfile b/dockerfile/php/sync/Dockerfile index 1ebd34c35..629c90f16 100644 --- a/dockerfile/php/sync/Dockerfile +++ b/dockerfile/php/sync/Dockerfile @@ -7,8 +7,8 @@ ARG DEST_DOCKER_USERNAME=906210846@qq.com ARG DEST_DOCKER_PASSWORD=fix_me ARG DEST_NAMESPACE=khs1994 # fix me 必须替换为自己的配置文件 -# ARG CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync-by-docker.json -ARG CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/20.10/dockerfile/php/sync/docker-image-sync.json +# ARG CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json +ARG CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/23.11/dockerfile/php/sync/docker-image-sync.json # ARG SOURCE_DOCKER_REGISTRY=registry-1.docker.io # ARG SOURCE_DOCKER_REGISTRY=hub-mirror.c.163.com diff --git a/dockerfile/php/sync/Jenkinsfile b/dockerfile/php/sync/Jenkinsfile index 130c189a6..544d95137 100644 --- a/dockerfile/php/sync/Jenkinsfile +++ b/dockerfile/php/sync/Jenkinsfile @@ -21,7 +21,7 @@ pipeline { stage('同步镜像-tencent-cloud') { steps { - sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/php/sync/docker-image-sync.json" + sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/php/sync/docker-image-sync.json" sh ''' docker run -i --rm \ @@ -33,7 +33,7 @@ pipeline { -e DEST_NAMESPACE=\${DEST_NAMESPACE} \ -e CI=true \ -e DOCKER_TOKEN_EXPIRE_TIME=115 \ - -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/php/sync/docker-image-sync.json \ + -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/php/sync/docker-image-sync.json \ -v \$PWD/docker-image-sync.json:/docker-entrypoint.d/docker-image-sync.json \ pcit-docker.pkg.coding.net/khs1994-docker/khs1994/docker-image-sync ''' diff --git a/dockerfile/php/sync/docker-image-sync.json b/dockerfile/php/sync/docker-image-sync.json index 715a31ef5..17105e9e9 100644 --- a/dockerfile/php/sync/docker-image-sync.json +++ b/dockerfile/php/sync/docker-image-sync.json @@ -1,57 +1,57 @@ [ { - "source": "php:8.2.13-cli-alpine" + "source": "php:8.3.0-cli-alpine" }, { - "source": "php:8.2.13-fpm-alpine" + "source": "php:8.3.0-fpm-alpine" }, { - "source": "php:8.2.13-unit-alpine" + "source": "php:8.3.0-unit-alpine" }, { - "source": "php:8.2.13-composer-alpine" + "source": "php:8.3.0-composer-alpine" }, { - "source": "php:8.2.13-swoole-alpine" + "source": "php:8.3.0-swoole-alpine" }, { - "source": "php:8.2.13-s6-alpine" + "source": "php:8.3.0-s6-alpine" }, { - "source": "php:8.1.26-cli-alpine" + "source": "php:8.2.13-cli-alpine" }, { - "source": "php:8.1.26-fpm-alpine" + "source": "php:8.2.13-fpm-alpine" }, { - "source": "php:8.1.26-unit-alpine" + "source": "php:8.2.13-unit-alpine" }, { - "source": "php:8.1.26-composer-alpine" + "source": "php:8.2.13-composer-alpine" }, { - "source": "php:8.1.26-swoole-alpine" + "source": "php:8.2.13-swoole-alpine" }, { - "source": "php:8.1.26-s6-alpine" + "source": "php:8.2.13-s6-alpine" }, { - "source": "php:8.0.30-cli-alpine" + "source": "php:8.1.26-cli-alpine" }, { - "source": "php:8.0.30-fpm-alpine" + "source": "php:8.1.26-fpm-alpine" }, { - "source": "php:8.0.30-unit-alpine" + "source": "php:8.1.26-unit-alpine" }, { - "source": "php:8.0.30-composer-alpine" + "source": "php:8.1.26-composer-alpine" }, { - "source": "php:8.0.30-swoole-alpine" + "source": "php:8.1.26-swoole-alpine" }, { - "source": "php:8.0.30-s6-alpine" + "source": "php:8.1.26-s6-alpine" }, { "source": "php:nightly-cli-alpine" diff --git a/dockerfile/php/sync/manifest.txt b/dockerfile/php/sync/manifest.txt index 2df0e95ab..6d258d0fa 100644 --- a/dockerfile/php/sync/manifest.txt +++ b/dockerfile/php/sync/manifest.txt @@ -1,3 +1,9 @@ +8.3.0-cli-alpine +8.3.0-fpm-alpine +8.3.0-unit-alpine +8.3.0-composer-alpine +8.3.0-swoole-alpine +8.3.0-s6-alpine 8.2.13-cli-alpine 8.2.13-fpm-alpine 8.2.13-unit-alpine diff --git a/dockerfile/sync/Dockerfile b/dockerfile/sync/Dockerfile index 8c630fd15..d7bb18a28 100644 --- a/dockerfile/sync/Dockerfile +++ b/dockerfile/sync/Dockerfile @@ -9,8 +9,8 @@ ARG DEST_DOCKER_USERNAME ARG DEST_DOCKER_PASSWORD ARG DEST_NAMESPACE # fix me 必须替换为自己的配置文件 -# ARG CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync-by-docker.json -ARG CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync-by-docker.json +# ARG CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json +ARG CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json # ARG SOURCE_DOCKER_REGISTRY=registry-1.docker.io # ARG SOURCE_DOCKER_REGISTRY=hub-mirror.c.163.com @@ -21,7 +21,7 @@ ENV DEST_DOCKER_USERNAME=$DEST_DOCKER_USERNAME ENV DEST_DOCKER_PASSWORD=$DEST_DOCKER_PASSWORD ENV DEST_NAMESPACE=$DEST_NAMESPACE # ENV CONFIG_URL=$CONFIG_URL -ENV CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync-by-docker.json +ENV CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json # ENV SOURCE_DOCKER_REGISTRY=$SOURCE_DOCKER_REGISTRY # 更多环境变量请查看 https://github.com/khs1994-docker/lnmp/blob/master/windows/docker-image-sync.Dockerfile diff --git a/dockerfile/sync/Jenkinsfile b/dockerfile/sync/Jenkinsfile index d65142881..e5a041e02 100644 --- a/dockerfile/sync/Jenkinsfile +++ b/dockerfile/sync/Jenkinsfile @@ -74,7 +74,7 @@ pipeline { stage('同步镜像') { steps { - sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync.json" + sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync.json" sh ''' docker run -i --rm \ @@ -86,7 +86,7 @@ pipeline { -e DEST_DOCKER_REGISTRY=\${DEST_DOCKER_REGISTRY} \ -e DEST_NAMESPACE=\${REGISTRY_NAMESPACE} \ -e CI=true \ - -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/20.10/dockerfile/sync/docker-image-sync.json \ + -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync.json \ -v \$PWD/docker-image-sync.json:/docker-entrypoint.d/docker-image-sync.json \ pcit-docker.pkg.coding.net/khs1994-docker/khs1994/docker-image-sync ''' diff --git a/docs/custom.md b/docs/custom.md index 642e4488d..cea455b10 100644 --- a/docs/custom.md +++ b/docs/custom.md @@ -37,7 +37,7 @@ services: php8: # 想修改哪个配置在这里重写即可，例如想使用自己的 PHP 镜像或国内镜像，那么增加 `image` 指令即可 - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.3.0}-fpm-alpine ``` 你也可以加上 `build` 字段，先构建镜像再启动 @@ -48,7 +48,7 @@ services: services: php8: - image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-fpm-alpine + image: ccr.ccs.tencentyun.com/khs1994/php:${LNMP_PHP_VERSION:-8.3.0}-fpm-alpine # 增加 build 字段 build: context: ./dockerfile/php/ diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index 733817245..9f683f892 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -158,7 +158,7 @@ jobs: sudo go env GOPATH sudo go version - git clone --depth=1 -b 20.10 https://github.com/khs1994-docker/lnmp ~/lnmp + git clone --depth=1 -b 23.11 https://github.com/khs1994-docker/lnmp ~/lnmp cp -r ~/lnmp/. /home/runner/work/lnmp-k8s ls -la /home/runner/work/lnmp-k8s # remove some apt source diff --git a/kubernetes/kubernetes-release/sync/Jenkinsfile b/kubernetes/kubernetes-release/sync/Jenkinsfile index e3fc0bc78..eb44989eb 100644 --- a/kubernetes/kubernetes-release/sync/Jenkinsfile +++ b/kubernetes/kubernetes-release/sync/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { // steps { // // sh "pwsh -c 'echo $env:LWPM_DOCKER_USERNAME' " // // sh "pwsh -c 'echo $env:LWPM_DOCKER_PASSWORD' " - // // sh "git clone --depth=1 -b 20.10 https://github.com/khs1994-docker/lnmp" + // // sh "git clone --depth=1 -b 23.11 https://github.com/khs1994-docker/lnmp" // // sh "pwsh ./lnmp/kubernetes/bin/lwpm.ps1" // sh "docker run -i --rm -e LWPM_DOCKER_USERNAME \ // -e LWPM_DOCKER_PASSWORD \ @@ -75,7 +75,7 @@ pipeline { stage('同步镜像') { steps { - sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/20.10/kubernetes/kubernetes-release/sync/docker-image-sync.json" + sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/23.11/kubernetes/kubernetes-release/sync/docker-image-sync.json" sh ''' sed -i -e "s#K8S_VERSION#${LWPM_K8S_VERSION}#g" \ @@ -94,7 +94,7 @@ pipeline { -e DEST_DOCKER_REGISTRY=\${LWPM_DOCKER_REGISTRY_MIRROR} \ -e SYNC_WINDOWS=true \ -e CI=true \ - -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/20.10/kubernetes/kubernetes-release/sync/docker-image-sync.json \ + -e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/kubernetes/kubernetes-release/sync/docker-image-sync.json \ -v \$PWD/docker-image-sync.json:/docker-entrypoint.d/docker-image-sync.json \ pcit-docker.pkg.coding.net/khs1994-docker/khs1994/docker-image-sync" } diff --git a/kubernetes/lnmp/php/base/lnmp-php.yaml b/kubernetes/lnmp/php/base/lnmp-php.yaml index 434218096..1a94f57fc 100644 --- a/kubernetes/lnmp/php/base/lnmp-php.yaml +++ b/kubernetes/lnmp/php/base/lnmp-php.yaml @@ -44,7 +44,7 @@ spec: kubernetes.io/os: linux containers: - name: lnmp-php - image: khs1994/php:8.2.13-fpm-alpine + image: khs1994/php:8.3.0-fpm-alpine imagePullPolicy: IfNotPresent args: - php-fpm diff --git a/lnmp-docker.ps1 b/lnmp-docker.ps1 index c80556413..9f51f573c 100755 --- a/lnmp-docker.ps1 +++ b/lnmp-docker.ps1 @@ -49,7 +49,7 @@ $env:COMPOSE_FILE = $null if ($args[0] -eq "install") { if (get-command git) { - git clone -b 20.10 --depth=1 https://github.com/khs1994-docker/lnmp.git $home\lnmp + git clone -b 23.11 --depth=1 https://github.com/khs1994-docker/lnmp.git $home\lnmp exit } diff --git a/lrew/nginx-unit/docker-compose.yml b/lrew/nginx-unit/docker-compose.yml index 24ed71454..48ec70d62 100644 --- a/lrew/nginx-unit/docker-compose.yml +++ b/lrew/nginx-unit/docker-compose.yml @@ -20,7 +20,7 @@ services: << : - *common - *common-label - image: "khs1994/php:${LNMP_PHP_VERSION:-8.2.13}-unit-alpine" + image: "khs1994/php:${LNMP_PHP_VERSION:-8.3.0}-unit-alpine" volumes: - ./config/${LNMP_NGINX_UNIT_CONF:-nginx-unit}:/etc/nginx-unit # ./path/unit-init-conf:/docker-entrypoint.d diff --git a/renovate.json b/renovate.json index 956902a5a..c08fdcb57 100644 --- a/renovate.json +++ b/renovate.json @@ -6,7 +6,7 @@ "khs1994" ], "baseBranches": [ - "20.10" + "23.11" ], "commitBody": "[skip ci]", "labels": [ diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index e84dc88e4..a3f38b232 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -12,7 +12,7 @@ services: image: memcached:1.6.15-alpine php: - image: php:8.2.13-fpm-alpine + image: php:8.3.0-fpm-alpine composer: image: composer:2.5.8 diff --git a/vscode-remote/docker-workspace.yml b/vscode-remote/docker-workspace.yml index e0b80d3d3..0675472f2 100644 --- a/vscode-remote/docker-workspace.yml +++ b/vscode-remote/docker-workspace.yml @@ -9,7 +9,7 @@ x-common: services: workspace: &workspace - image: khs1994/php:8.2.13-composer-alpine + image: khs1994/php:8.3.0-composer-alpine networks: - backend volumes: @@ -68,7 +68,7 @@ services: << : - *workspace - *common - image: "khs1994/php:8.2.13-composer-alpine" + image: "khs1994/php:8.3.0-composer-alpine" command: [] # install | update npm: diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.json b/windows/lnmp-windows-pm-repo/php/lwpm.json index 4d6f90c33..b271985d7 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php/lwpm.json @@ -10,7 +10,7 @@ "C:\\php", "C:\\php-pre" ], - "pre-version": "8.2.13", + "pre-version": "8.3.0", "releases": "https://www.php.net/downloads.php", "scripts": { "get-version": "if(!($VERSION)){\n$VERSION=$stable_version\n}\nif($isPre){\n$VC_VERSION=\"nts-Win32-vs16\"\n$VERSION=$pre_version\n$url=\"https://windows.php.net/downloads/qa/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/qa/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php-pre\"\n$global:PHP_PREFIX=\"C:\\php-pre\"\n}else{\n$VC_VERSION=\"nts-Win32-vs16\"\n$url=\"https://windows.php.net/downloads/releases/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$url_mirror=\"https://windows.php.net/downloads/releases/archives/php-${VERSION}-${VC_VERSION}-x64.zip\"\n$unzipDesc=\"php\"\n$global:PHP_PREFIX=\"C:\\php\"\n}", @@ -32,5 +32,5 @@ "uninstall": "if($isPre -eq 1){_cleanup \"C:\\php-pre\"}else{_cleanup \"C:\\php\"}\n", "version": "(php -v).split(\" \")[1]" }, - "version": "8.2.13" + "version": "8.3.0" } diff --git a/windows/lnmp-windows-pm-repo/php/lwpm.yaml b/windows/lnmp-windows-pm-repo/php/lwpm.yaml index 0897440a8..aac64782f 100644 --- a/windows/lnmp-windows-pm-repo/php/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php/lwpm.yaml @@ -1,7 +1,7 @@ name: "php" description: "PHP is a popular general-purpose scripting language that is especially suited to web development" -version: "8.2.13" -pre-version: "8.2.13" +version: "8.3.0" +pre-version: "8.3.0" homepage: "https://www.php.net/" bug: "https://www.php.net/" github: "php/php-src" diff --git a/wsl/Dockerfile b/wsl/Dockerfile index 837711c2a..a01b81e74 100755 --- a/wsl/Dockerfile +++ b/wsl/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim ################################################################################ -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 ARG PHP_NUM=82 diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index 2b7af4306..a24b53875 100755 --- a/wsl/lnmp-wsl-builder-php +++ b/wsl/lnmp-wsl-builder-php @@ -66,7 +66,7 @@ export TZ=Asia/Shanghai # export CC=clang CXX=clang export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.13 +export PHP_LATEST_VERSION=8.3.0 ################################################################################ for command in "$@" diff --git a/wsl/lnmp-wsl-builder-php-rhel b/wsl/lnmp-wsl-builder-php-rhel index cf1f3aec3..c2cf5f382 100755 --- a/wsl/lnmp-wsl-builder-php-rhel +++ b/wsl/lnmp-wsl-builder-php-rhel @@ -56,7 +56,7 @@ export TZ=Asia/Shanghai # export CC=clang CXX=clang # export CC=gcc CXX=g++ -export PHP_LATEST_VERSION=8.2.13 +export PHP_LATEST_VERSION=8.3.0 ################################################################################ # diff --git a/wsl/wsl.phpbuilder.Dockerfile b/wsl/wsl.phpbuilder.Dockerfile index 50a772dea..c887a9c70 100755 --- a/wsl/wsl.phpbuilder.Dockerfile +++ b/wsl/wsl.phpbuilder.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 COPY lnmp-wsl-builder-php /lnmp-wsl-builder-php.sh diff --git a/wsl/wsl.phpbuilder.rhel.Dockerfile b/wsl/wsl.phpbuilder.rhel.Dockerfile index f315a62b8..634f97933 100755 --- a/wsl/wsl.phpbuilder.rhel.Dockerfile +++ b/wsl/wsl.phpbuilder.rhel.Dockerfile @@ -8,7 +8,7 @@ ARG LNMP_CN_ENV=false ENV LNMP_CN_ENV=${LNMP_CN_ENV} -ARG PHP_VERSION=8.2.13 +ARG PHP_VERSION=8.3.0 COPY lnmp-wsl-builder-php-rhel /lnmp-wsl-builder-php-rhel.sh From c43044f7636d78b7133678f63ae4e9d38011916b Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sat, 17 Feb 2024 18:58:56 +0800 Subject: [PATCH 39/42] [config] Update default config Signed-off-by: Kang Huaishuai --- config/mariadb/default/etc/mysql/debian-start | 12 +- config/mariadb/default/etc/mysql/mariadb.cnf | 3 - .../etc/mysql/mariadb.conf.d/05-skipcache.cnf | 3 + .../mysql/mariadb.conf.d/50-mysqld_safe.cnf | 28 ---- .../etc/mysql/mariadb.conf.d/50-server.cnf | 17 +-- config/path.md | 144 ++++++++++++++---- .../usr/local/etc/php-fpm.d/docker.conf | 3 +- .../default/usr/local/etc/php-fpm.d/www.conf | 41 ++++- .../usr/local/etc/php-fpm.d/www.conf.default | 41 ++++- .../usr/local/etc/php/conf.d/docker-fpm.ini | 2 + config/php8/default/usr/local/etc/pear.conf | 2 +- .../usr/local/etc/php-fpm.d/docker.conf | 3 +- .../default/usr/local/etc/php-fpm.d/www.conf | 41 ++++- .../usr/local/etc/php-fpm.d/www.conf.default | 41 ++++- .../usr/local/etc/php/conf.d/docker-fpm.ini | 2 + .../usr/local/etc/php/php.ini-development | 48 ++++-- .../usr/local/etc/php/php.ini-production | 50 ++++-- config/php8/php.development.ini | 48 ++++-- config/php8/php.production.ini | 50 ++++-- 19 files changed, 419 insertions(+), 160 deletions(-) create mode 100644 config/mariadb/default/etc/mysql/mariadb.conf.d/05-skipcache.cnf delete mode 100644 config/mariadb/default/etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf create mode 100644 config/php/default/usr/local/etc/php/conf.d/docker-fpm.ini create mode 100644 config/php8/default/usr/local/etc/php/conf.d/docker-fpm.ini diff --git a/config/mariadb/default/etc/mysql/debian-start b/config/mariadb/default/etc/mysql/debian-start index ffe635dc8..2a8b61dda 100755 --- a/config/mariadb/default/etc/mysql/debian-start +++ b/config/mariadb/default/etc/mysql/debian-start @@ -17,12 +17,12 @@ if [ -f /etc/default/mariadb ]; then . /etc/default/mariadb fi -MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf" -MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" -# Don't run full mysql_upgrade on every server restart, use --version-check to do it only once -MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check" -MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf" -MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables" +MARIADB="/usr/bin/mariadb --defaults-file=/etc/mysql/debian.cnf" +MYADMIN="/usr/bin/mariadb-admin --defaults-file=/etc/mysql/debian.cnf" +# Don't run full mariadb-upgrade on every server restart, use --version-check to do it only once +MYUPGRADE="/usr/bin/mariadb-upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent" +MYCHECK="/usr/bin/mariadb-check --defaults-file=/etc/mysql/debian.cnf" +MYCHECK_SUBJECT="WARNING: mariadb-check has found corrupt tables" MYCHECK_PARAMS="--all-databases --fast --silent" MYCHECK_RCPT="${MYCHECK_RCPT:-root}" diff --git a/config/mariadb/default/etc/mysql/mariadb.cnf b/config/mariadb/default/etc/mysql/mariadb.cnf index d6b86097e..9d0d4c14a 100644 --- a/config/mariadb/default/etc/mysql/mariadb.cnf +++ b/config/mariadb/default/etc/mysql/mariadb.cnf @@ -25,9 +25,6 @@ socket = /run/mysqld/mysqld.sock # Import all .cnf files from configuration directory -[mariadbd] -skip-host-cache -skip-name-resolve !includedir /etc/mysql/mariadb.conf.d/ !includedir /etc/mysql/conf.d/ diff --git a/config/mariadb/default/etc/mysql/mariadb.conf.d/05-skipcache.cnf b/config/mariadb/default/etc/mysql/mariadb.conf.d/05-skipcache.cnf new file mode 100644 index 000000000..338e65441 --- /dev/null +++ b/config/mariadb/default/etc/mysql/mariadb.conf.d/05-skipcache.cnf @@ -0,0 +1,3 @@ +[mariadb] +host-cache-size=0 +skip-name-resolve diff --git a/config/mariadb/default/etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf b/config/mariadb/default/etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf deleted file mode 100644 index e24f96a9e..000000000 --- a/config/mariadb/default/etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf +++ /dev/null @@ -1,28 +0,0 @@ -# NOTE: THIS FILE IS READ ONLY BY THE TRADITIONAL SYSV INIT SCRIPT, NOT SYSTEMD. -# MARIADB SYSTEMD DOES _NOT_ UTILIZE MYSQLD_SAFE NOR READ THIS FILE. -# -# For similar behavior, systemd users should create the following file: -# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf -# -# To achieve the same result as the default 50-mysqld_safe.cnf, please create -# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf -# with the following contents: -# -# [Service] -# User = mysql -# StandardOutput = syslog -# StandardError = syslog -# SyslogFacility = daemon -# SyslogLevel = err -# SyslogIdentifier = mysqld -# -# For more information, please read https://mariadb.com/kb/en/mariadb/systemd/ - -[mysqld_safe] -# This will be passed to all mysql clients -# It has been reported that passwords should be enclosed with ticks/quotes -# especially if they contain "#" chars... - -nice = 0 -skip_log_error -syslog diff --git a/config/mariadb/default/etc/mysql/mariadb.conf.d/50-server.cnf b/config/mariadb/default/etc/mysql/mariadb.conf.d/50-server.cnf index 588c331d6..38db30ab2 100644 --- a/config/mariadb/default/etc/mysql/mariadb.conf.d/50-server.cnf +++ b/config/mariadb/default/etc/mysql/mariadb.conf.d/50-server.cnf @@ -15,11 +15,8 @@ #user = mysql pid-file = /run/mysqld/mysqld.pid basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -lc-messages = en_US -skip-external-locking +#datadir = /var/lib/mysql +#tmpdir = /tmp # Broken reverse DNS slows down connections considerably and name resolve is # safe to skip if there are no "host by domain name" access grants @@ -59,11 +56,11 @@ skip-external-locking # Enable this if you want to have error logging into a separate file #log_error = /var/log/mysql/error.log # Enable the slow query log to see queries with especially long duration -#slow_query_log_file = /var/log/mysql/mariadb-slow.log -#long_query_time = 10 +#log_slow_query_file = /var/log/mysql/mariadb-slow.log +#log_slow_query_time = 10 #log_slow_verbosity = query_plan,explain #log-queries-not-using-indexes -#min_examined_row_limit = 1000 +#log_slow_min_examined_row_limit = 1000 # The following can be used as easy to replay backup logs or for replication. # note: if you are setting up a replication slave, see README.Debian about @@ -111,7 +108,7 @@ collation-server = utf8mb4_general_ci # you can put MariaDB-only options here [mariadb] -# This group is only read by MariaDB-10.6 servers. +# This group is only read by MariaDB-10.11 servers. # If you use the same .cnf file for MariaDB of different versions, # use this group for options that older servers don't understand -[mariadb-10.6] +[mariadb-10.11] diff --git a/config/path.md b/config/path.md index 8d9911924..3be22fc4f 100644 --- a/config/path.md +++ b/config/path.md @@ -10,6 +10,9 @@ ├── default.sh ├── docker-compose.yml ├── etc +│   ├── apt +│   │   ├── sources.list.debian +│   │   └── sources.list.debian.wsl │   ├── buildkit │   │   ├── buildkitd.default.toml │   │   └── buildkitd.toml @@ -45,6 +48,8 @@ │   │   └── t.khs1994.com.key │   └── demo-vhost.conf ├── mariadb +│   ├── conf.d +│   │   └── docker.cnf │   ├── default │   │   └── etc │   │   └── mysql @@ -53,9 +58,9 @@ │   │   ├── debian.cnf │   │   ├── mariadb.cnf │   │   ├── mariadb.conf.d +│   │   │   ├── 05-skipcache.cnf │   │   │   ├── 50-client.cnf │   │   │   ├── 50-mysql-clients.cnf -│   │   │   ├── 50-mysqld_safe.cnf │   │   │   ├── 50-server.cnf │   │   │   ├── 60-galera.cnf │   │   │   └── 99-enable-encryption.cnf.preset @@ -71,12 +76,9 @@ │   │   └── docker.cnf │   ├── default │   │   └── etc +│   │   ├── my.cnf │   │   └── mysql -│   │   ├── conf.d -│   │   │   ├── docker.cnf -│   │   │   └── mysql.cnf -│   │   ├── my.cnf -│   │   └── my.cnf.fallback +│   │   └── conf.d │   ├── docker.cnf │   └── docker.production.cnf ├── nginx @@ -84,13 +86,9 @@ │   ├── auth │   │   └── README.md │   ├── demo-ajax-header.config -│   ├── demo-fzjh-80.config -│   ├── demo-fzjh.config │   ├── demo-include-php.config │   ├── demo-include-ssl-common.config │   ├── demo-include-ssl.config -│   ├── demo-linuxkit.config -│   ├── demo-registry.config │   ├── demo-satis.conf │   ├── demo-ssl │   │   ├── root-ca.crt @@ -98,19 +96,22 @@ │   │   └── t.khs1994.com.key │   ├── demo-ssl.config │   ├── demo-www.conf -│   ├── demo-www.config │   ├── demo.config +│   │   ├── docker-registry.config │   │   ├── docker.mirror.config +│   │   ├── fzjh-80.config +│   │   ├── fzjh.config │   │   ├── gitlab.config +│   │   ├── gogs.config │   │   ├── gzip.config │   │   ├── http3.config +│   │   ├── laravel.config +│   │   ├── linuxkit.config +│   │   ├── minio.config │   │   ├── phpmyadmin.config │   │   ├── ppm.config │   │   ├── unit-laravel.config │   │   └── unit-proxy.config -│   ├── fzjh.conf -│   ├── gogs.config -│   ├── minio.config │   ├── ssl-self │   └── wait-for-php.sh ├── nginx-unit @@ -128,6 +129,7 @@ │   │   └── etc │   │   ├── php │   │   │   ├── conf.d +│   │   │   │   ├── docker-fpm.ini │   │   │   │   ├── docker-php-ext-sodium.ini │   │   │   │   ├── docker-php-ext-zip.ini │   │   │   │   ├── php-ext-bcmath.ini @@ -183,6 +185,7 @@ │   │   ├── pear.conf │   │   ├── php │   │   │   ├── conf.d +│   │   │   │   ├── docker-fpm.ini │   │   │   │   ├── docker-php-ext-sodium.ini │   │   │   │   ├── docker-php-ext-zip.ini │   │   │   │   ├── php-ext-bcmath.ini @@ -246,19 +249,100 @@ │   └── nginx.htpasswd.demo ├── s6 │   ├── README.md -│   ├── s6-rc.d -│   │   ├── laravel-horizon -│   │   │   ├── log -│   │   │   │   └── run -│   │   │   └── run -│   │   ├── php-fpm -│   │   │   ├── finish -│   │   │   ├── run -│   │   │   └── type -│   │   └── user -│   │   └── contents.d -│   │   ├── laravel-horizon -│   │   └── php-fpm +│   ├── demo +│   │   ├── README.md +│   │   ├── cont-init.d +│   │   │   └── 01-contenv-example +│   │   ├── fix-attrs.d +│   │   │   ├── 01-mysql-data-dir +│   │   │   └── 02-mysql-log-dirs +│   │   ├── s6-overlay +│   │   │   ├── s6-rc.d +│   │   │   │   ├── README.md +│   │   │   │   ├── myapp +│   │   │   │   │   ├── finish +│   │   │   │   │   ├── producer-for +│   │   │   │   │   ├── run +│   │   │   │   │   └── type +│   │   │   │   ├── myapp-log +│   │   │   │   │   ├── consumer-for +│   │   │   │   │   ├── dependencies +│   │   │   │   │   ├── pipeline-name +│   │   │   │   │   ├── run +│   │   │   │   │   └── type +│   │   │   │   ├── myapp-log-prepare +│   │   │   │   │   ├── type +│   │   │   │   │   └── up +│   │   │   │   └── user +│   │   │   │   └── contents.d +│   │   │   │   └── myapp +│   │   │   └── scripts +│   │   │   └── myapp-log-prepare +│   │   └── services.d +│   │   └── myapp +│   │   ├── finish +│   │   ├── log +│   │   │   └── run +│   │   └── run +│   ├── s6-overlay +│   │   ├── s6-rc.d +│   │   │   ├── crond +│   │   │   │   ├── producer-for +│   │   │   │   ├── run +│   │   │   │   └── type +│   │   │   ├── crond-log +│   │   │   │   ├── consumer-for +│   │   │   │   ├── dependencies +│   │   │   │   ├── pipeline-name +│   │   │   │   ├── run +│   │   │   │   └── type +│   │   │   ├── laravel-horizon +│   │   │   │   ├── dependencies +│   │   │   │   ├── producer-for +│   │   │   │   ├── run +│   │   │   │   └── type +│   │   │   ├── laravel-horizon-log +│   │   │   │   ├── consumer-for +│   │   │   │   ├── dependencies +│   │   │   │   ├── pipeline-name +│   │   │   │   ├── run +│   │   │   │   └── type +│   │   │   ├── laravel-prepare +│   │   │   │   ├── type +│   │   │   │   └── up +│   │   │   ├── laravel-queue +│   │   │   │   ├── dependencies +│   │   │   │   ├── producer-for +│   │   │   │   ├── run +│   │   │   │   └── type +│   │   │   ├── laravel-queue-log +│   │   │   │   ├── consumer-for +│   │   │   │   ├── dependencies +│   │   │   │   ├── pipeline-name +│   │   │   │   ├── run +│   │   │   │   └── type +│   │   │   ├── php-fpm +│   │   │   │   ├── finish +│   │   │   │   ├── run +│   │   │   │   └── type +│   │   │   ├── user +│   │   │   │   ├── contents.d +│   │   │   │   │   ├── crond +│   │   │   │   │   ├── crond-log +│   │   │   │   │   ├── crond-pipeline +│   │   │   │   │   ├── laravel-horizon +│   │   │   │   │   ├── laravel-horizon-log +│   │   │   │   │   ├── laravel-horizon-pipeline +│   │   │   │   │   ├── laravel-queue +│   │   │   │   │   ├── laravel-queue-log +│   │   │   │   │   ├── laravel-queue-pipeline +│   │   │   │   │   └── php-fpm +│   │   │   │   └── type +│   │   │   └── user2 +│   │   │   ├── contents.d +│   │   │   └── type +│   │   └── scripts +│   │   └── laravel-prepare │   └── services.d │   ├── crond │   │   └── run @@ -271,13 +355,9 @@ │   └── php-fpm │   ├── finish │   └── run -├── s6-overlay -│   ├── README.md -│   └── fix-attrs.d -│   └── 01-mysql-data-dir ├── supervisord │   └── supervisord.ini.example └── yarn -70 directories, 208 files +93 directories, 265 files ``` diff --git a/config/php/default/usr/local/etc/php-fpm.d/docker.conf b/config/php/default/usr/local/etc/php-fpm.d/docker.conf index 5b0f01cf1..bf993fe1e 100644 --- a/config/php/default/usr/local/etc/php-fpm.d/docker.conf +++ b/config/php/default/usr/local/etc/php-fpm.d/docker.conf @@ -5,7 +5,8 @@ error_log = /proc/self/fd/2 log_limit = 8192 [www] -; if we send this to /proc/self/fd/1, it never appears +; php-fpm closes STDOUT on startup, so sending logs to /proc/self/fd/1 does not work. +; https://bugs.php.net/bug.php?id=73886 access.log = /proc/self/fd/2 clear_env = no diff --git a/config/php/default/usr/local/etc/php-fpm.d/www.conf b/config/php/default/usr/local/etc/php-fpm.d/www.conf index 03c710986..5bd9e5c70 100644 --- a/config/php/default/usr/local/etc/php-fpm.d/www.conf +++ b/config/php/default/usr/local/etc/php-fpm.d/www.conf @@ -17,9 +17,14 @@ ; Default Value: none ;prefix = /path/to/pools/$pool -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. +; Unix user/group of the child processes. This can be used only if the master +; process running user is root. It is set after the child process is created. +; The user and group can be specified either by their name or by their numeric +; IDs. +; Note: If the user is root, the executable needs to be started with +; --allow-to-run-as-root option to work. +; Default Values: The user is set to master process running user by default. +; If the group is not set, the user's group is used. user = www-data group = www-data @@ -36,18 +41,19 @@ group = www-data listen = 127.0.0.1:9000 ; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) +; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD) ;listen.backlog = 511 ; Set permissions for unix socket, if one is used. In Linux, read/write ; permissions must be set in order to allow connections from a web server. Many ; BSD-derived systems allow connections regardless of permissions. The owner ; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 +; Default Values: Owner is set to the master process running user. If the group +; is not set, the owner's group is used. Mode is set to 0660. ;listen.owner = www-data ;listen.group = www-data ;listen.mode = 0660 + ; When POSIX Access Control Lists are supported you can set them using ; these options, value is a comma separated list of user/group names. ; When set, listen.owner and listen.group are ignored @@ -62,6 +68,10 @@ listen = 127.0.0.1:9000 ; Default Value: any ;listen.allowed_clients = 127.0.0.1 +; Set the associated the route table (FIB). FreeBSD only +; Default Value: -1 +;listen.setfib = 1 + ; Specify the nice(2) priority to apply to the pool processes (only if set) ; The value can vary from -19 (highest priority) to 20 (lower priority) ; Note: - It will only work if the FPM master process is launched as root @@ -70,7 +80,8 @@ listen = 127.0.0.1:9000 ; Default Value: no set ; process.priority = -19 -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user +; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or +; PROC_TRACE_CTL procctl for FreeBSD) even if the process user ; or group is different than the master process user. It allows to create process ; core dump and ptrace the process for the pool user. ; Default Value: no @@ -342,6 +353,22 @@ pm.max_spare_servers = 3 ; Default: "%R - %u %t \"%m %r\" %s" ;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%" +; A list of request_uri values which should be filtered from the access log. +; +; As a security precuation, this setting will be ignored if: +; - the request method is not GET or HEAD; or +; - there is a request body; or +; - there are query parameters; or +; - the response code is outwith the successful range of 200 to 299 +; +; Note: The paths are matched against the output of the access.format tag "%r". +; On common configurations, this may look more like SCRIPT_NAME than the +; expected pre-rewrite URI. +; +; Default Value: not set +;access.suppress_path[] = /ping +;access.suppress_path[] = /health_check.php + ; The log file for slow requests ; Default Value: not set ; Note: slowlog is mandatory if request_slowlog_timeout is set diff --git a/config/php/default/usr/local/etc/php-fpm.d/www.conf.default b/config/php/default/usr/local/etc/php-fpm.d/www.conf.default index 03c710986..5bd9e5c70 100644 --- a/config/php/default/usr/local/etc/php-fpm.d/www.conf.default +++ b/config/php/default/usr/local/etc/php-fpm.d/www.conf.default @@ -17,9 +17,14 @@ ; Default Value: none ;prefix = /path/to/pools/$pool -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. +; Unix user/group of the child processes. This can be used only if the master +; process running user is root. It is set after the child process is created. +; The user and group can be specified either by their name or by their numeric +; IDs. +; Note: If the user is root, the executable needs to be started with +; --allow-to-run-as-root option to work. +; Default Values: The user is set to master process running user by default. +; If the group is not set, the user's group is used. user = www-data group = www-data @@ -36,18 +41,19 @@ group = www-data listen = 127.0.0.1:9000 ; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) +; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD) ;listen.backlog = 511 ; Set permissions for unix socket, if one is used. In Linux, read/write ; permissions must be set in order to allow connections from a web server. Many ; BSD-derived systems allow connections regardless of permissions. The owner ; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 +; Default Values: Owner is set to the master process running user. If the group +; is not set, the owner's group is used. Mode is set to 0660. ;listen.owner = www-data ;listen.group = www-data ;listen.mode = 0660 + ; When POSIX Access Control Lists are supported you can set them using ; these options, value is a comma separated list of user/group names. ; When set, listen.owner and listen.group are ignored @@ -62,6 +68,10 @@ listen = 127.0.0.1:9000 ; Default Value: any ;listen.allowed_clients = 127.0.0.1 +; Set the associated the route table (FIB). FreeBSD only +; Default Value: -1 +;listen.setfib = 1 + ; Specify the nice(2) priority to apply to the pool processes (only if set) ; The value can vary from -19 (highest priority) to 20 (lower priority) ; Note: - It will only work if the FPM master process is launched as root @@ -70,7 +80,8 @@ listen = 127.0.0.1:9000 ; Default Value: no set ; process.priority = -19 -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user +; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or +; PROC_TRACE_CTL procctl for FreeBSD) even if the process user ; or group is different than the master process user. It allows to create process ; core dump and ptrace the process for the pool user. ; Default Value: no @@ -342,6 +353,22 @@ pm.max_spare_servers = 3 ; Default: "%R - %u %t \"%m %r\" %s" ;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%" +; A list of request_uri values which should be filtered from the access log. +; +; As a security precuation, this setting will be ignored if: +; - the request method is not GET or HEAD; or +; - there is a request body; or +; - there are query parameters; or +; - the response code is outwith the successful range of 200 to 299 +; +; Note: The paths are matched against the output of the access.format tag "%r". +; On common configurations, this may look more like SCRIPT_NAME than the +; expected pre-rewrite URI. +; +; Default Value: not set +;access.suppress_path[] = /ping +;access.suppress_path[] = /health_check.php + ; The log file for slow requests ; Default Value: not set ; Note: slowlog is mandatory if request_slowlog_timeout is set diff --git a/config/php/default/usr/local/etc/php/conf.d/docker-fpm.ini b/config/php/default/usr/local/etc/php/conf.d/docker-fpm.ini new file mode 100644 index 000000000..69e787a0c --- /dev/null +++ b/config/php/default/usr/local/etc/php/conf.d/docker-fpm.ini @@ -0,0 +1,2 @@ +; https://github.com/docker-library/php/issues/878#issuecomment-938595965 +fastcgi.logging = Off diff --git a/config/php8/default/usr/local/etc/pear.conf b/config/php8/default/usr/local/etc/pear.conf index 19c04b20a..465fa1a15 100644 --- a/config/php8/default/usr/local/etc/pear.conf +++ b/config/php8/default/usr/local/etc/pear.conf @@ -1,2 +1,2 @@ #PEAR_Config 0.9 -a:33:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:18:"/usr/local/lib/php";s:7:"ext_dir";s:55:"/usr/local/lib/php/extensions/no-debug-non-zts-20210902";s:7:"doc_dir";s:22:"/usr/local/lib/php/doc";s:7:"bin_dir";s:14:"/usr/local/bin";s:8:"data_dir";s:23:"/usr/local/lib/php/data";s:7:"cfg_dir";s:22:"/usr/local/lib/php/cfg";s:7:"www_dir";s:25:"/usr/local/lib/php/htdocs";s:7:"man_dir";s:28:"/usr/local/lib/php/local/man";s:8:"test_dir";s:23:"/usr/local/lib/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:18:"/tmp/pear/download";s:7:"php_bin";s:18:"/usr/local/bin/php";s:10:"php_prefix";s:0:"";s:10:"php_suffix";s:0:"";s:7:"php_ini";s:0:"";s:12:"metadata_dir";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:18:"/usr/local/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:23:"/usr/local/etc/pearkeys";} \ No newline at end of file +a:33:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:18:"/usr/local/lib/php";s:7:"ext_dir";s:55:"/usr/local/lib/php/extensions/no-debug-non-zts-20220829";s:7:"doc_dir";s:22:"/usr/local/lib/php/doc";s:7:"bin_dir";s:14:"/usr/local/bin";s:8:"data_dir";s:23:"/usr/local/lib/php/data";s:7:"cfg_dir";s:22:"/usr/local/lib/php/cfg";s:7:"www_dir";s:25:"/usr/local/lib/php/htdocs";s:7:"man_dir";s:28:"/usr/local/lib/php/local/man";s:8:"test_dir";s:23:"/usr/local/lib/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:18:"/tmp/pear/download";s:7:"php_bin";s:18:"/usr/local/bin/php";s:10:"php_prefix";s:0:"";s:10:"php_suffix";s:0:"";s:7:"php_ini";s:0:"";s:12:"metadata_dir";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:18:"/usr/local/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:23:"/usr/local/etc/pearkeys";} \ No newline at end of file diff --git a/config/php8/default/usr/local/etc/php-fpm.d/docker.conf b/config/php8/default/usr/local/etc/php-fpm.d/docker.conf index 5b0f01cf1..bf993fe1e 100644 --- a/config/php8/default/usr/local/etc/php-fpm.d/docker.conf +++ b/config/php8/default/usr/local/etc/php-fpm.d/docker.conf @@ -5,7 +5,8 @@ error_log = /proc/self/fd/2 log_limit = 8192 [www] -; if we send this to /proc/self/fd/1, it never appears +; php-fpm closes STDOUT on startup, so sending logs to /proc/self/fd/1 does not work. +; https://bugs.php.net/bug.php?id=73886 access.log = /proc/self/fd/2 clear_env = no diff --git a/config/php8/default/usr/local/etc/php-fpm.d/www.conf b/config/php8/default/usr/local/etc/php-fpm.d/www.conf index 03c710986..5bd9e5c70 100644 --- a/config/php8/default/usr/local/etc/php-fpm.d/www.conf +++ b/config/php8/default/usr/local/etc/php-fpm.d/www.conf @@ -17,9 +17,14 @@ ; Default Value: none ;prefix = /path/to/pools/$pool -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. +; Unix user/group of the child processes. This can be used only if the master +; process running user is root. It is set after the child process is created. +; The user and group can be specified either by their name or by their numeric +; IDs. +; Note: If the user is root, the executable needs to be started with +; --allow-to-run-as-root option to work. +; Default Values: The user is set to master process running user by default. +; If the group is not set, the user's group is used. user = www-data group = www-data @@ -36,18 +41,19 @@ group = www-data listen = 127.0.0.1:9000 ; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) +; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD) ;listen.backlog = 511 ; Set permissions for unix socket, if one is used. In Linux, read/write ; permissions must be set in order to allow connections from a web server. Many ; BSD-derived systems allow connections regardless of permissions. The owner ; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 +; Default Values: Owner is set to the master process running user. If the group +; is not set, the owner's group is used. Mode is set to 0660. ;listen.owner = www-data ;listen.group = www-data ;listen.mode = 0660 + ; When POSIX Access Control Lists are supported you can set them using ; these options, value is a comma separated list of user/group names. ; When set, listen.owner and listen.group are ignored @@ -62,6 +68,10 @@ listen = 127.0.0.1:9000 ; Default Value: any ;listen.allowed_clients = 127.0.0.1 +; Set the associated the route table (FIB). FreeBSD only +; Default Value: -1 +;listen.setfib = 1 + ; Specify the nice(2) priority to apply to the pool processes (only if set) ; The value can vary from -19 (highest priority) to 20 (lower priority) ; Note: - It will only work if the FPM master process is launched as root @@ -70,7 +80,8 @@ listen = 127.0.0.1:9000 ; Default Value: no set ; process.priority = -19 -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user +; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or +; PROC_TRACE_CTL procctl for FreeBSD) even if the process user ; or group is different than the master process user. It allows to create process ; core dump and ptrace the process for the pool user. ; Default Value: no @@ -342,6 +353,22 @@ pm.max_spare_servers = 3 ; Default: "%R - %u %t \"%m %r\" %s" ;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%" +; A list of request_uri values which should be filtered from the access log. +; +; As a security precuation, this setting will be ignored if: +; - the request method is not GET or HEAD; or +; - there is a request body; or +; - there are query parameters; or +; - the response code is outwith the successful range of 200 to 299 +; +; Note: The paths are matched against the output of the access.format tag "%r". +; On common configurations, this may look more like SCRIPT_NAME than the +; expected pre-rewrite URI. +; +; Default Value: not set +;access.suppress_path[] = /ping +;access.suppress_path[] = /health_check.php + ; The log file for slow requests ; Default Value: not set ; Note: slowlog is mandatory if request_slowlog_timeout is set diff --git a/config/php8/default/usr/local/etc/php-fpm.d/www.conf.default b/config/php8/default/usr/local/etc/php-fpm.d/www.conf.default index 03c710986..5bd9e5c70 100644 --- a/config/php8/default/usr/local/etc/php-fpm.d/www.conf.default +++ b/config/php8/default/usr/local/etc/php-fpm.d/www.conf.default @@ -17,9 +17,14 @@ ; Default Value: none ;prefix = /path/to/pools/$pool -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. +; Unix user/group of the child processes. This can be used only if the master +; process running user is root. It is set after the child process is created. +; The user and group can be specified either by their name or by their numeric +; IDs. +; Note: If the user is root, the executable needs to be started with +; --allow-to-run-as-root option to work. +; Default Values: The user is set to master process running user by default. +; If the group is not set, the user's group is used. user = www-data group = www-data @@ -36,18 +41,19 @@ group = www-data listen = 127.0.0.1:9000 ; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) +; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD) ;listen.backlog = 511 ; Set permissions for unix socket, if one is used. In Linux, read/write ; permissions must be set in order to allow connections from a web server. Many ; BSD-derived systems allow connections regardless of permissions. The owner ; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 +; Default Values: Owner is set to the master process running user. If the group +; is not set, the owner's group is used. Mode is set to 0660. ;listen.owner = www-data ;listen.group = www-data ;listen.mode = 0660 + ; When POSIX Access Control Lists are supported you can set them using ; these options, value is a comma separated list of user/group names. ; When set, listen.owner and listen.group are ignored @@ -62,6 +68,10 @@ listen = 127.0.0.1:9000 ; Default Value: any ;listen.allowed_clients = 127.0.0.1 +; Set the associated the route table (FIB). FreeBSD only +; Default Value: -1 +;listen.setfib = 1 + ; Specify the nice(2) priority to apply to the pool processes (only if set) ; The value can vary from -19 (highest priority) to 20 (lower priority) ; Note: - It will only work if the FPM master process is launched as root @@ -70,7 +80,8 @@ listen = 127.0.0.1:9000 ; Default Value: no set ; process.priority = -19 -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user +; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or +; PROC_TRACE_CTL procctl for FreeBSD) even if the process user ; or group is different than the master process user. It allows to create process ; core dump and ptrace the process for the pool user. ; Default Value: no @@ -342,6 +353,22 @@ pm.max_spare_servers = 3 ; Default: "%R - %u %t \"%m %r\" %s" ;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%" +; A list of request_uri values which should be filtered from the access log. +; +; As a security precuation, this setting will be ignored if: +; - the request method is not GET or HEAD; or +; - there is a request body; or +; - there are query parameters; or +; - the response code is outwith the successful range of 200 to 299 +; +; Note: The paths are matched against the output of the access.format tag "%r". +; On common configurations, this may look more like SCRIPT_NAME than the +; expected pre-rewrite URI. +; +; Default Value: not set +;access.suppress_path[] = /ping +;access.suppress_path[] = /health_check.php + ; The log file for slow requests ; Default Value: not set ; Note: slowlog is mandatory if request_slowlog_timeout is set diff --git a/config/php8/default/usr/local/etc/php/conf.d/docker-fpm.ini b/config/php8/default/usr/local/etc/php/conf.d/docker-fpm.ini new file mode 100644 index 000000000..69e787a0c --- /dev/null +++ b/config/php8/default/usr/local/etc/php/conf.d/docker-fpm.ini @@ -0,0 +1,2 @@ +; https://github.com/docker-library/php/issues/878#issuecomment-938595965 +fastcgi.logging = Off diff --git a/config/php8/default/usr/local/etc/php/php.ini-development b/config/php8/default/usr/local/etc/php/php.ini-development index 604059bfb..61cd33e89 100644 --- a/config/php8/default/usr/local/etc/php/php.ini-development +++ b/config/php8/default/usr/local/etc/php/php.ini-development @@ -9,8 +9,8 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: ; 1. SAPI module specific location. -; 2. The PHPRC environment variable. (As of PHP 5.2.0) -; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) +; 2. The PHPRC environment variable. +; 3. A number of predefined registry keys on Windows ; 4. Current working directory (except CLI) ; 5. The web server's directory (for SAPI modules), or directory of PHP ; (otherwise in Windows) @@ -423,6 +423,11 @@ max_input_time = 60 ; How many GET/POST/COOKIE input variables may be accepted ;max_input_vars = 1000 +; How many multipart body parts (combined input variable and file uploads) may +; be accepted. +; Default Value: -1 (Sum of max_input_vars and max_file_uploads) +;max_multipart_body_parts = 1500 + ; Maximum amount of memory a script may consume ; https://php.net/memory-limit memory_limit = 128M @@ -447,7 +452,7 @@ memory_limit = 128M ; development and early testing. ; ; Error Level Constants: -; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) +; E_ALL - All errors and warnings ; E_ERROR - fatal run-time errors ; E_RECOVERABLE_ERROR - almost fatal run-time errors ; E_WARNING - run-time warnings (non-fatal errors) @@ -908,11 +913,17 @@ default_socket_timeout = 60 ; ; Notes for Windows environments : ; -; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) -; extension folders as well as the separate PECL DLL download (PHP 5+). +; - Many DLL files are located in the ext/ +; extension folders as well as the separate PECL DLL download. ; Be sure to appropriately set the extension_dir directive. ; ;extension=bz2 + +; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used +; otherwise it results in segfault when unloading after using SASL. +; See https://github.com/php/php-src/issues/8620 for more info. +;extension=ldap + ;extension=curl ;extension=ffi ;extension=ftp @@ -922,7 +933,6 @@ default_socket_timeout = 60 ;extension=gmp ;extension=intl ;extension=imap -;extension=ldap ;extension=mbstring ;extension=exif ; Must be after mbstring as it depends on it ;extension=mysqli @@ -949,6 +959,7 @@ default_socket_timeout = 60 ;extension=sqlite3 ;extension=tidy ;extension=xsl +;extension=zip ;zend_extension=opcache @@ -1089,6 +1100,10 @@ smtp_port = 25 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename mail.add_x_header = Off +; Use mixed LF and CRLF line separators to keep compatibility with some +; RFC 2822 non conformant MTA. +mail.mixed_lf_and_crlf = Off + ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = @@ -1186,9 +1201,6 @@ mysqli.default_user = ; https://php.net/mysqli.default-pw mysqli.default_pw = -; Allow or prevent reconnect -mysqli.reconnect = Off - ; If this option is enabled, closing a persistent connection will rollback ; any pending transactions of this connection, before it is put back ; into the persistent connection pool. @@ -1254,7 +1266,7 @@ mysqlnd.collect_memory_statistics = On ;oci8.ping_interval = 60 ; Connection: Set this to a user chosen connection class to be used -; for all pooled server requests with Oracle 11g Database Resident +; for all pooled server requests with Oracle Database Resident ; Connection Pooling (DRCP). To use DRCP, this value should be set to ; the same string for all web servers running the same application, ; the database pool must be configured, and the connection string must @@ -1271,11 +1283,18 @@ mysqlnd.collect_memory_statistics = On ; https://php.net/oci8.statement-cache-size ;oci8.statement_cache_size = 20 -; Tuning: Enables statement prefetching and sets the default number of +; Tuning: Enables row prefetching and sets the default number of ; rows that will be fetched automatically after statement execution. ; https://php.net/oci8.default-prefetch ;oci8.default_prefetch = 100 +; Tuning: Sets the amount of LOB data that is internally returned from +; Oracle Database when an Oracle LOB locator is initially retrieved as +; part of a query. Setting this can improve performance by reducing +; round-trips. +; https://php.net/oci8.prefetch-lob-size +; oci8.prefetch_lob_size = 0 + ; Compatibility. Using On means oci_close() will not close ; oci_connect() and oci_new_connect() connections. ; https://php.net/oci8.old-oci-close-semantics @@ -1883,7 +1902,12 @@ ldap.max_links = -1 ;opcache.file_cache_fallback=1 ; Enables or disables copying of PHP code (text segment) into HUGE PAGES. -; This should improve performance, but requires appropriate OS configuration. +; Under certain circumstances (if only a single global PHP process is +; started from which all others fork), this can increase performance +; by a tiny amount because TLB misses are reduced. On the other hand, this +; delays PHP startup, increases memory usage and degrades performance +; under memory pressure - use with care. +; Requires appropriate OS configuration. ;opcache.huge_code_pages=0 ; Validate cached file permissions. diff --git a/config/php8/default/usr/local/etc/php/php.ini-production b/config/php8/default/usr/local/etc/php/php.ini-production index b39a960f3..2189660c0 100644 --- a/config/php8/default/usr/local/etc/php/php.ini-production +++ b/config/php8/default/usr/local/etc/php/php.ini-production @@ -9,8 +9,8 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: ; 1. SAPI module specific location. -; 2. The PHPRC environment variable. (As of PHP 5.2.0) -; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) +; 2. The PHPRC environment variable. +; 3. A number of predefined registry keys on Windows ; 4. Current working directory (except CLI) ; 5. The web server's directory (for SAPI modules), or directory of PHP ; (otherwise in Windows) @@ -425,6 +425,11 @@ max_input_time = 60 ; How many GET/POST/COOKIE input variables may be accepted ;max_input_vars = 1000 +; How many multipart body parts (combined input variable and file uploads) may +; be accepted. +; Default Value: -1 (Sum of max_input_vars and max_file_uploads) +;max_multipart_body_parts = 1500 + ; Maximum amount of memory a script may consume ; https://php.net/memory-limit memory_limit = 128M @@ -449,7 +454,7 @@ memory_limit = 128M ; development and early testing. ; ; Error Level Constants: -; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) +; E_ALL - All errors and warnings ; E_ERROR - fatal run-time errors ; E_RECOVERABLE_ERROR - almost fatal run-time errors ; E_WARNING - run-time warnings (non-fatal errors) @@ -910,11 +915,17 @@ default_socket_timeout = 60 ; ; Notes for Windows environments : ; -; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) -; extension folders as well as the separate PECL DLL download (PHP 5+). +; - Many DLL files are located in the ext/ +; extension folders as well as the separate PECL DLL download. ; Be sure to appropriately set the extension_dir directive. ; ;extension=bz2 + +; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used +; otherwise it results in segfault when unloading after using SASL. +; See https://github.com/php/php-src/issues/8620 for more info. +;extension=ldap + ;extension=curl ;extension=ffi ;extension=ftp @@ -924,7 +935,6 @@ default_socket_timeout = 60 ;extension=gmp ;extension=intl ;extension=imap -;extension=ldap ;extension=mbstring ;extension=exif ; Must be after mbstring as it depends on it ;extension=mysqli @@ -951,6 +961,7 @@ default_socket_timeout = 60 ;extension=sqlite3 ;extension=tidy ;extension=xsl +;extension=zip ;zend_extension=opcache @@ -1091,6 +1102,10 @@ smtp_port = 25 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename mail.add_x_header = Off +; Use mixed LF and CRLF line separators to keep compatibility with some +; RFC 2822 non conformant MTA. +mail.mixed_lf_and_crlf = Off + ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = @@ -1188,9 +1203,6 @@ mysqli.default_user = ; https://php.net/mysqli.default-pw mysqli.default_pw = -; Allow or prevent reconnect -mysqli.reconnect = Off - ; If this option is enabled, closing a persistent connection will rollback ; any pending transactions of this connection, before it is put back ; into the persistent connection pool. @@ -1256,7 +1268,7 @@ mysqlnd.collect_memory_statistics = Off ;oci8.ping_interval = 60 ; Connection: Set this to a user chosen connection class to be used -; for all pooled server requests with Oracle 11g Database Resident +; for all pooled server requests with Oracle Database Resident ; Connection Pooling (DRCP). To use DRCP, this value should be set to ; the same string for all web servers running the same application, ; the database pool must be configured, and the connection string must @@ -1273,11 +1285,18 @@ mysqlnd.collect_memory_statistics = Off ; https://php.net/oci8.statement-cache-size ;oci8.statement_cache_size = 20 -; Tuning: Enables statement prefetching and sets the default number of +; Tuning: Enables row prefetching and sets the default number of ; rows that will be fetched automatically after statement execution. ; https://php.net/oci8.default-prefetch ;oci8.default_prefetch = 100 +; Tuning: Sets the amount of LOB data that is internally returned from +; Oracle Database when an Oracle LOB locator is initially retrieved as +; part of a query. Setting this can improve performance by reducing +; round-trips. +; https://php.net/oci8.prefetch-lob-size +; oci8.prefetch_lob_size = 0 + ; Compatibility. Using On means oci_close() will not close ; oci_connect() and oci_new_connect() connections. ; https://php.net/oci8.old-oci-close-semantics @@ -1885,8 +1904,13 @@ ldap.max_links = -1 ;opcache.file_cache_fallback=1 ; Enables or disables copying of PHP code (text segment) into HUGE PAGES. -; This should improve performance, but requires appropriate OS configuration. -;opcache.huge_code_pages=1 +; Under certain circumstances (if only a single global PHP process is +; started from which all others fork), this can increase performance +; by a tiny amount because TLB misses are reduced. On the other hand, this +; delays PHP startup, increases memory usage and degrades performance +; under memory pressure - use with care. +; Requires appropriate OS configuration. +;opcache.huge_code_pages=0 ; Validate cached file permissions. ;opcache.validate_permission=0 diff --git a/config/php8/php.development.ini b/config/php8/php.development.ini index 604059bfb..61cd33e89 100644 --- a/config/php8/php.development.ini +++ b/config/php8/php.development.ini @@ -9,8 +9,8 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: ; 1. SAPI module specific location. -; 2. The PHPRC environment variable. (As of PHP 5.2.0) -; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) +; 2. The PHPRC environment variable. +; 3. A number of predefined registry keys on Windows ; 4. Current working directory (except CLI) ; 5. The web server's directory (for SAPI modules), or directory of PHP ; (otherwise in Windows) @@ -423,6 +423,11 @@ max_input_time = 60 ; How many GET/POST/COOKIE input variables may be accepted ;max_input_vars = 1000 +; How many multipart body parts (combined input variable and file uploads) may +; be accepted. +; Default Value: -1 (Sum of max_input_vars and max_file_uploads) +;max_multipart_body_parts = 1500 + ; Maximum amount of memory a script may consume ; https://php.net/memory-limit memory_limit = 128M @@ -447,7 +452,7 @@ memory_limit = 128M ; development and early testing. ; ; Error Level Constants: -; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) +; E_ALL - All errors and warnings ; E_ERROR - fatal run-time errors ; E_RECOVERABLE_ERROR - almost fatal run-time errors ; E_WARNING - run-time warnings (non-fatal errors) @@ -908,11 +913,17 @@ default_socket_timeout = 60 ; ; Notes for Windows environments : ; -; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) -; extension folders as well as the separate PECL DLL download (PHP 5+). +; - Many DLL files are located in the ext/ +; extension folders as well as the separate PECL DLL download. ; Be sure to appropriately set the extension_dir directive. ; ;extension=bz2 + +; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used +; otherwise it results in segfault when unloading after using SASL. +; See https://github.com/php/php-src/issues/8620 for more info. +;extension=ldap + ;extension=curl ;extension=ffi ;extension=ftp @@ -922,7 +933,6 @@ default_socket_timeout = 60 ;extension=gmp ;extension=intl ;extension=imap -;extension=ldap ;extension=mbstring ;extension=exif ; Must be after mbstring as it depends on it ;extension=mysqli @@ -949,6 +959,7 @@ default_socket_timeout = 60 ;extension=sqlite3 ;extension=tidy ;extension=xsl +;extension=zip ;zend_extension=opcache @@ -1089,6 +1100,10 @@ smtp_port = 25 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename mail.add_x_header = Off +; Use mixed LF and CRLF line separators to keep compatibility with some +; RFC 2822 non conformant MTA. +mail.mixed_lf_and_crlf = Off + ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = @@ -1186,9 +1201,6 @@ mysqli.default_user = ; https://php.net/mysqli.default-pw mysqli.default_pw = -; Allow or prevent reconnect -mysqli.reconnect = Off - ; If this option is enabled, closing a persistent connection will rollback ; any pending transactions of this connection, before it is put back ; into the persistent connection pool. @@ -1254,7 +1266,7 @@ mysqlnd.collect_memory_statistics = On ;oci8.ping_interval = 60 ; Connection: Set this to a user chosen connection class to be used -; for all pooled server requests with Oracle 11g Database Resident +; for all pooled server requests with Oracle Database Resident ; Connection Pooling (DRCP). To use DRCP, this value should be set to ; the same string for all web servers running the same application, ; the database pool must be configured, and the connection string must @@ -1271,11 +1283,18 @@ mysqlnd.collect_memory_statistics = On ; https://php.net/oci8.statement-cache-size ;oci8.statement_cache_size = 20 -; Tuning: Enables statement prefetching and sets the default number of +; Tuning: Enables row prefetching and sets the default number of ; rows that will be fetched automatically after statement execution. ; https://php.net/oci8.default-prefetch ;oci8.default_prefetch = 100 +; Tuning: Sets the amount of LOB data that is internally returned from +; Oracle Database when an Oracle LOB locator is initially retrieved as +; part of a query. Setting this can improve performance by reducing +; round-trips. +; https://php.net/oci8.prefetch-lob-size +; oci8.prefetch_lob_size = 0 + ; Compatibility. Using On means oci_close() will not close ; oci_connect() and oci_new_connect() connections. ; https://php.net/oci8.old-oci-close-semantics @@ -1883,7 +1902,12 @@ ldap.max_links = -1 ;opcache.file_cache_fallback=1 ; Enables or disables copying of PHP code (text segment) into HUGE PAGES. -; This should improve performance, but requires appropriate OS configuration. +; Under certain circumstances (if only a single global PHP process is +; started from which all others fork), this can increase performance +; by a tiny amount because TLB misses are reduced. On the other hand, this +; delays PHP startup, increases memory usage and degrades performance +; under memory pressure - use with care. +; Requires appropriate OS configuration. ;opcache.huge_code_pages=0 ; Validate cached file permissions. diff --git a/config/php8/php.production.ini b/config/php8/php.production.ini index b39a960f3..2189660c0 100644 --- a/config/php8/php.production.ini +++ b/config/php8/php.production.ini @@ -9,8 +9,8 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: ; 1. SAPI module specific location. -; 2. The PHPRC environment variable. (As of PHP 5.2.0) -; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) +; 2. The PHPRC environment variable. +; 3. A number of predefined registry keys on Windows ; 4. Current working directory (except CLI) ; 5. The web server's directory (for SAPI modules), or directory of PHP ; (otherwise in Windows) @@ -425,6 +425,11 @@ max_input_time = 60 ; How many GET/POST/COOKIE input variables may be accepted ;max_input_vars = 1000 +; How many multipart body parts (combined input variable and file uploads) may +; be accepted. +; Default Value: -1 (Sum of max_input_vars and max_file_uploads) +;max_multipart_body_parts = 1500 + ; Maximum amount of memory a script may consume ; https://php.net/memory-limit memory_limit = 128M @@ -449,7 +454,7 @@ memory_limit = 128M ; development and early testing. ; ; Error Level Constants: -; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) +; E_ALL - All errors and warnings ; E_ERROR - fatal run-time errors ; E_RECOVERABLE_ERROR - almost fatal run-time errors ; E_WARNING - run-time warnings (non-fatal errors) @@ -910,11 +915,17 @@ default_socket_timeout = 60 ; ; Notes for Windows environments : ; -; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) -; extension folders as well as the separate PECL DLL download (PHP 5+). +; - Many DLL files are located in the ext/ +; extension folders as well as the separate PECL DLL download. ; Be sure to appropriately set the extension_dir directive. ; ;extension=bz2 + +; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used +; otherwise it results in segfault when unloading after using SASL. +; See https://github.com/php/php-src/issues/8620 for more info. +;extension=ldap + ;extension=curl ;extension=ffi ;extension=ftp @@ -924,7 +935,6 @@ default_socket_timeout = 60 ;extension=gmp ;extension=intl ;extension=imap -;extension=ldap ;extension=mbstring ;extension=exif ; Must be after mbstring as it depends on it ;extension=mysqli @@ -951,6 +961,7 @@ default_socket_timeout = 60 ;extension=sqlite3 ;extension=tidy ;extension=xsl +;extension=zip ;zend_extension=opcache @@ -1091,6 +1102,10 @@ smtp_port = 25 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename mail.add_x_header = Off +; Use mixed LF and CRLF line separators to keep compatibility with some +; RFC 2822 non conformant MTA. +mail.mixed_lf_and_crlf = Off + ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = @@ -1188,9 +1203,6 @@ mysqli.default_user = ; https://php.net/mysqli.default-pw mysqli.default_pw = -; Allow or prevent reconnect -mysqli.reconnect = Off - ; If this option is enabled, closing a persistent connection will rollback ; any pending transactions of this connection, before it is put back ; into the persistent connection pool. @@ -1256,7 +1268,7 @@ mysqlnd.collect_memory_statistics = Off ;oci8.ping_interval = 60 ; Connection: Set this to a user chosen connection class to be used -; for all pooled server requests with Oracle 11g Database Resident +; for all pooled server requests with Oracle Database Resident ; Connection Pooling (DRCP). To use DRCP, this value should be set to ; the same string for all web servers running the same application, ; the database pool must be configured, and the connection string must @@ -1273,11 +1285,18 @@ mysqlnd.collect_memory_statistics = Off ; https://php.net/oci8.statement-cache-size ;oci8.statement_cache_size = 20 -; Tuning: Enables statement prefetching and sets the default number of +; Tuning: Enables row prefetching and sets the default number of ; rows that will be fetched automatically after statement execution. ; https://php.net/oci8.default-prefetch ;oci8.default_prefetch = 100 +; Tuning: Sets the amount of LOB data that is internally returned from +; Oracle Database when an Oracle LOB locator is initially retrieved as +; part of a query. Setting this can improve performance by reducing +; round-trips. +; https://php.net/oci8.prefetch-lob-size +; oci8.prefetch_lob_size = 0 + ; Compatibility. Using On means oci_close() will not close ; oci_connect() and oci_new_connect() connections. ; https://php.net/oci8.old-oci-close-semantics @@ -1885,8 +1904,13 @@ ldap.max_links = -1 ;opcache.file_cache_fallback=1 ; Enables or disables copying of PHP code (text segment) into HUGE PAGES. -; This should improve performance, but requires appropriate OS configuration. -;opcache.huge_code_pages=1 +; Under certain circumstances (if only a single global PHP process is +; started from which all others fork), this can increase performance +; by a tiny amount because TLB misses are reduced. On the other hand, this +; delays PHP startup, increases memory usage and degrades performance +; under memory pressure - use with care. +; Requires appropriate OS configuration. +;opcache.huge_code_pages=0 ; Validate cached file permissions. ;opcache.validate_permission=0 From 22228d6f57a1ac8c518f02f00cd9d910d4c056b2 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 18 Feb 2024 00:42:48 +0800 Subject: [PATCH 40/42] [lwpm] add more soft Signed-off-by: Kang Huaishuai --- .../{frp => frpc}/lwpm.json | 13 +++--- windows/lnmp-windows-pm-repo/frps/lwpm.json | 33 ++++++++++++++ .../lnmp-windows-pm-repo/php-xdebug/lwpm.json | 4 +- .../lnmp-windows-pm-repo/php-xdebug/lwpm.yaml | 4 +- windows/lnmp-windows-pm-repo/ssh/README.md | 9 ++++ windows/lnmp-windows-pm-repo/ssh/lwpm.json | 41 +++++++++++++++++ windows/lnmp-windows-pm-repo/ssh/lwpm.yaml | 35 +++++++++++++++ windows/lnmp-windows-pm-repo/sshd/README.md | 9 ++++ windows/lnmp-windows-pm-repo/sshd/lwpm.json | 45 +++++++++++++++++++ windows/lnmp-windows-pm-repo/sshd/lwpm.yaml | 39 ++++++++++++++++ .../vsCode-server/README.md | 9 ++++ .../vsCode-server/lwpm.json | 40 +++++++++++++++++ .../vsCode-server/lwpm.yaml | 35 +++++++++++++++ .../wechatDevtool/lwpm.json | 4 +- windows/lnmp-windows-pm-repo/zeal/lwpm.json | 4 +- 15 files changed, 309 insertions(+), 15 deletions(-) rename windows/lnmp-windows-pm-repo/{frp => frpc}/lwpm.json (68%) create mode 100644 windows/lnmp-windows-pm-repo/frps/lwpm.json create mode 100644 windows/lnmp-windows-pm-repo/ssh/README.md create mode 100644 windows/lnmp-windows-pm-repo/ssh/lwpm.json create mode 100644 windows/lnmp-windows-pm-repo/ssh/lwpm.yaml create mode 100644 windows/lnmp-windows-pm-repo/sshd/README.md create mode 100644 windows/lnmp-windows-pm-repo/sshd/lwpm.json create mode 100644 windows/lnmp-windows-pm-repo/sshd/lwpm.yaml create mode 100644 windows/lnmp-windows-pm-repo/vsCode-server/README.md create mode 100644 windows/lnmp-windows-pm-repo/vsCode-server/lwpm.json create mode 100644 windows/lnmp-windows-pm-repo/vsCode-server/lwpm.yaml diff --git a/windows/lnmp-windows-pm-repo/frp/lwpm.json b/windows/lnmp-windows-pm-repo/frpc/lwpm.json similarity index 68% rename from windows/lnmp-windows-pm-repo/frp/lwpm.json rename to windows/lnmp-windows-pm-repo/frpc/lwpm.json index 76d134f8f..525ba04e7 100644 --- a/windows/lnmp-windows-pm-repo/frp/lwpm.json +++ b/windows/lnmp-windows-pm-repo/frpc/lwpm.json @@ -1,8 +1,8 @@ { - "name": "frp", + "name": "frpc", "description": "A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet", - "version": "0.48.0", - "pre-version": "0.48.0", + "version": "0.54.0", + "pre-version": "0.54.0", "homepage": "https://github.com/fatedier/frp", "bug": "https://github.com/fatedier/frp/issues", "github": "fatedier/frp", @@ -20,13 +20,12 @@ "version": "frpc --version", "install": [ "if($IsWindows){_unzip $filename $unzipDesc}else{_mkdir frp ; tar -zxf $filename -C frp}", - "if($IsWindows){Copy-item frp\\frp_${VERSION}_windows_amd64\\frpc.exe C:\\bin\\}", - "if($IsWindows){Copy-item frp\\frp_${VERSION}_windows_amd64\\frpc.ini C:\\bin\\frpc.example.ini}", + "if($IsWindows){Copy-item frpc\\frp_${VERSION}_windows_amd64\\frpc.exe C:\\bin\\}", + "if($IsWindows){Copy-item frpc\\frp_${VERSION}_windows_amd64\\frpc.toml C:\\bin\\frpc.example.toml}", "if(!$IsWindows){sudo install -m755 frp/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}/frpc /usr/local/bin}", - "if(!$IsWindows){sudo install -m755 frp/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}/frps /usr/local/bin}", "_cleanup frp" ], - "uninstall": "if($IsWindows){Remove-item C:\\bin\\frpc.exe ; Remove-item C:\\bin\\frps.exe}else{sudo rm -rf /usr/local/bin/frpc ; sudo rm -rf /usr/local/bin/frps }" + "uninstall": "if($IsWindows){Remove-item C:\\bin\\frpc.exe}else{sudo rm -rf /usr/local/bin/frpc}" }, "path": [ "C:\\bin" diff --git a/windows/lnmp-windows-pm-repo/frps/lwpm.json b/windows/lnmp-windows-pm-repo/frps/lwpm.json new file mode 100644 index 000000000..898fed0f2 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/frps/lwpm.json @@ -0,0 +1,33 @@ +{ + "name": "frps", + "description": "A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet", + "version": "0.54.0", + "pre-version": "0.54.0", + "homepage": "https://github.com/fatedier/frp", + "bug": "https://github.com/fatedier/frp/issues", + "github": "fatedier/frp", + "releases": "https://github.com/fatedier/frp/releases", + "url": "https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", + "url-mirror": "https://${env:GITHUB_MIRROR}/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}.$(if($_IsWindows){echo zip}else{echo tar.gz})", + "command": "frps", + "scripts": { + "service": [ + "C:\\bin\\frps.exe", + "-c", + "C:\\bin\\frps.ini" + ], + "test": "printInfo frp $(frps --version) install success", + "version": "frps --version", + "install": [ + "if($IsWindows){_unzip $filename $unzipDesc}else{_mkdir frp ; tar -zxf $filename -C frp}", + "if($IsWindows){Copy-item frps\\frp_${VERSION}_windows_amd64\\frps.exe C:\\bin\\}", + "if($IsWindows){Copy-item frps\\frp_${VERSION}_windows_amd64\\frps.toml C:\\bin\\frps.example.toml}", + "if(!$IsWindows){sudo install -m755 frp/frp_${VERSION}_${env:lwpm_os}_${env:lwpm_architecture}/frps /usr/local/bin}", + "_cleanup frp" + ], + "uninstall": "if($IsWindows){Remove-item C:\\bin\\frps.exe}else{ sudo rm -rf /usr/local/bin/frps }" + }, + "path": [ + "C:\\bin" + ] +} diff --git a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json index d32afda63..33af3e44e 100644 --- a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json +++ b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.json @@ -10,7 +10,7 @@ "os": "windows", "pre-url": "", "pre-url-mirror": "", - "pre-version": "3.2.0", + "pre-version": "3.3.1", "releases": "", "scripts": { "install": [ @@ -31,5 +31,5 @@ }, "url": "", "url-mirror": "", - "version": "3.2.0" + "version": "3.3.1" } diff --git a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml index 486f54a97..82162a383 100644 --- a/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml +++ b/windows/lnmp-windows-pm-repo/php-xdebug/lwpm.yaml @@ -1,7 +1,7 @@ name: php-xdebug description: "" -version: "3.2.0" -pre-version: "3.2.0" +version: "3.3.1" +pre-version: "3.3.1" homepage: "" bug: "" github: xdebug/xdebug diff --git a/windows/lnmp-windows-pm-repo/ssh/README.md b/windows/lnmp-windows-pm-repo/ssh/README.md new file mode 100644 index 000000000..6b6516e55 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/ssh/README.md @@ -0,0 +1,9 @@ +# LWPM + +* https://packagist.org/packages/lwpm/ + +```bash +$ lnmp-windows-pm.ps1 add example + +$ lnmp-windows-pm.ps1 install example +``` diff --git a/windows/lnmp-windows-pm-repo/ssh/lwpm.json b/windows/lnmp-windows-pm-repo/ssh/lwpm.json new file mode 100644 index 000000000..75b62a1ed --- /dev/null +++ b/windows/lnmp-windows-pm-repo/ssh/lwpm.json @@ -0,0 +1,41 @@ +{ + "architecture": "amd64", + "bug": "", + "command": "sshd", + "description": "", + "download-filename": "OpenSSH-Win64.zip", + "github": "PowerShell/Win32-OpenSSH", + "homepage": "", + "name": "ssh", + "os": "windows", + "path": [ + "$env:ProgramFiles\\OpenSSH-Win64" + ], + "pre-url": "https://github.com/PowerShell/Win32-OpenSSH/releases/download/v${VERSION}/OpenSSH-Win64.zip", + "pre-url-mirror": "", + "pre-version": "9.5.0.0p1-Beta", + "releases": "", + "scripts": { + "install": [ + "_unzip $filename $env:ProgramFiles", + "cd $env:ProgramFiles\\OpenSSH-Win64 ; powershell.exe -ExecutionPolicy Bypass -File install-sshd.ps1", + "Get-Service ssh-agent | Set-Service -StartupType Automatic", + "net start ssh-agent" + ], + "postinstall": "", + "posttest": "", + "postuninstall": "", + "preinstall": [ + "_cleanup $env:ProgramFiles\\OpenSSH-Win64" + ], + "pretest": "", + "preuninstall": "", + "pruneuninstall": "", + "test": "", + "uninstall": "cd $env:ProgramFiles\\OpenSSH-Win64 ; powershell.exe -ExecutionPolicy Bypass -File uninstall-sshd.ps1", + "version": "" + }, + "url": "https://github.com/PowerShell/Win32-OpenSSH/releases/download/v${VERSION}/OpenSSH-Win64.zip", + "url-mirror": "", + "version": "9.5.0.0p1-Beta" +} diff --git a/windows/lnmp-windows-pm-repo/ssh/lwpm.yaml b/windows/lnmp-windows-pm-repo/ssh/lwpm.yaml new file mode 100644 index 000000000..058712044 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/ssh/lwpm.yaml @@ -0,0 +1,35 @@ +name: ssh +description: "" +version: 9.5.0.0p1-Beta +pre-version: 9.5.0.0p1-Beta +homepage: "" +bug: "" +github: PowerShell/Win32-OpenSSH +releases: "" +url: https://github.com/PowerShell/Win32-OpenSSH/releases/download/v${VERSION}/OpenSSH-Win64.zip +url-mirror: "" +pre-url: https://github.com/PowerShell/Win32-OpenSSH/releases/download/v${VERSION}/OpenSSH-Win64.zip +pre-url-mirror: "" +command: "sshd" +download-filename: OpenSSH-Win64.zip +architecture: amd64 +os: windows +scripts: + preinstall: + - '_cleanup $env:ProgramFiles\OpenSSH-Win64' + install: + - '_unzip $filename $env:ProgramFiles' + - 'cd $env:ProgramFiles\OpenSSH-Win64 ; powershell.exe -ExecutionPolicy Bypass -File install-sshd.ps1' + - 'Get-Service ssh-agent | Set-Service -StartupType Automatic' + - 'net start ssh-agent' + postinstall: "" + preuninstall: "" + uninstall: 'cd $env:ProgramFiles\OpenSSH-Win64 ; powershell.exe -ExecutionPolicy Bypass -File uninstall-sshd.ps1' + postuninstall: "" + pruneuninstall: "" + pretest: "" + test: "" + posttest: "" + version: "" +path: +- $env:ProgramFiles\OpenSSH-Win64 diff --git a/windows/lnmp-windows-pm-repo/sshd/README.md b/windows/lnmp-windows-pm-repo/sshd/README.md new file mode 100644 index 000000000..6b6516e55 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/sshd/README.md @@ -0,0 +1,9 @@ +# LWPM + +* https://packagist.org/packages/lwpm/ + +```bash +$ lnmp-windows-pm.ps1 add example + +$ lnmp-windows-pm.ps1 install example +``` diff --git a/windows/lnmp-windows-pm-repo/sshd/lwpm.json b/windows/lnmp-windows-pm-repo/sshd/lwpm.json new file mode 100644 index 000000000..b511c4e28 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/sshd/lwpm.json @@ -0,0 +1,45 @@ +{ + "architecture": "amd64", + "bug": "", + "command": "sshd", + "description": "", + "download-filename": "OpenSSH-Win64.zip", + "github": "PowerShell/Win32-OpenSSH", + "homepage": "", + "name": "sshd", + "os": "windows", + "path": [ + "$env:ProgramFiles\\OpenSSH-Win64" + ], + "pre-url": "https://github.com/PowerShell/Win32-OpenSSH/releases/download/v${VERSION}/OpenSSH-Win64.zip", + "pre-url-mirror": "", + "pre-version": "9.5.0.0p1-Beta", + "releases": "", + "scripts": { + "install": [ + "_unzip $filename $env:ProgramFiles", + "cd $env:ProgramFiles\\OpenSSH-Win64 ; powershell.exe -ExecutionPolicy Bypass -File install-sshd.ps1", + "Set-Service sshd -StartupType Automatic", + "net start sshd", + "sleep 5", + "new-item C:\\ProgramData\\ssh\\administrators_authorized_keys", + "icacls.exe \"C:\\ProgramData\\ssh\\administrators_authorized_keys\" /inheritance:r /grant \"Administrators:F\" /grant \"SYSTEM:F\"", + "net stop sshd" + ], + "postinstall": "", + "posttest": "", + "postuninstall": "", + "preinstall": [ + "_cleanup $env:ProgramFiles\\OpenSSH-Win64" + ], + "pretest": "", + "preuninstall": "", + "pruneuninstall": "", + "test": "", + "uninstall": "cd $env:ProgramFiles\\OpenSSH-Win64 ; powershell.exe -ExecutionPolicy Bypass -File uninstall-sshd.ps1", + "version": "" + }, + "url": "https://github.com/PowerShell/Win32-OpenSSH/releases/download/v${VERSION}/OpenSSH-Win64.zip", + "url-mirror": "", + "version": "9.5.0.0p1-Beta" +} diff --git a/windows/lnmp-windows-pm-repo/sshd/lwpm.yaml b/windows/lnmp-windows-pm-repo/sshd/lwpm.yaml new file mode 100644 index 000000000..eace75a87 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/sshd/lwpm.yaml @@ -0,0 +1,39 @@ +name: sshd +description: "" +version: 9.5.0.0p1-Beta +pre-version: 9.5.0.0p1-Beta +homepage: "" +bug: "" +github: PowerShell/Win32-OpenSSH +releases: "" +url: https://github.com/PowerShell/Win32-OpenSSH/releases/download/v${VERSION}/OpenSSH-Win64.zip +url-mirror: "" +pre-url: https://github.com/PowerShell/Win32-OpenSSH/releases/download/v${VERSION}/OpenSSH-Win64.zip +pre-url-mirror: "" +command: "sshd" +download-filename: OpenSSH-Win64.zip +architecture: amd64 +os: windows +scripts: + preinstall: + - '_cleanup $env:ProgramFiles\OpenSSH-Win64' + install: + - '_unzip $filename $env:ProgramFiles' + - 'cd $env:ProgramFiles\OpenSSH-Win64 ; powershell.exe -ExecutionPolicy Bypass -File install-sshd.ps1' + - 'Set-Service sshd -StartupType Automatic' + - 'net start sshd' + - 'sleep 5' + - 'new-item C:\ProgramData\ssh\administrators_authorized_keys' + - 'icacls.exe "C:\ProgramData\ssh\administrators_authorized_keys" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F"' + - 'net stop sshd' + postinstall: "" + preuninstall: "" + uninstall: 'cd $env:ProgramFiles\OpenSSH-Win64 ; powershell.exe -ExecutionPolicy Bypass -File uninstall-sshd.ps1' + postuninstall: "" + pruneuninstall: "" + pretest: "" + test: "" + posttest: "" + version: "" +path: +- $env:ProgramFiles\OpenSSH-Win64 diff --git a/windows/lnmp-windows-pm-repo/vsCode-server/README.md b/windows/lnmp-windows-pm-repo/vsCode-server/README.md new file mode 100644 index 000000000..6b6516e55 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/vsCode-server/README.md @@ -0,0 +1,9 @@ +# LWPM + +* https://packagist.org/packages/lwpm/ + +```bash +$ lnmp-windows-pm.ps1 add example + +$ lnmp-windows-pm.ps1 install example +``` diff --git a/windows/lnmp-windows-pm-repo/vsCode-server/lwpm.json b/windows/lnmp-windows-pm-repo/vsCode-server/lwpm.json new file mode 100644 index 000000000..a043888f3 --- /dev/null +++ b/windows/lnmp-windows-pm-repo/vsCode-server/lwpm.json @@ -0,0 +1,40 @@ +{ + "architecture": "amd64", + "bug": "", + "command": "", + "description": "", + "download-filename": "", + "github": "", + "homepage": "", + "name": "vscode-server", + "os": "windows", + "path": [ + "C:\\bin" + ], + "pre-url": "", + "pre-url-mirror": "", + "pre-version": "", + "releases": "", + "scripts": { + "get-version": "$VERSION=$((code --version).split(' ')[1])\n", + "install": [ + "_unzip $filename $HOME/.vscode-server/bin/", + "mv $HOME/.vscode-server/bin/vscode-server-win32-x64 $HOME/.vscode-server/bin/${VERSION}" + ], + "postinstall": "", + "posttest": "", + "postuninstall": "", + "preinstall": [ + "_cleanup $HOME/.vscode-server/bin/vscode-server-win32-x64" + ], + "pretest": "", + "preuninstall": "", + "pruneuninstall": "", + "test": "", + "uninstall": "_cleanup $HOME/.vscode-server/bin/${VERSION}", + "version": "" + }, + "url": "https://vscode.download.prss.microsoft.com/dbazure/download/stable/${VERSION}/vscode-server-win32-x64.zip", + "url-mirror": "", + "version": "" +} diff --git a/windows/lnmp-windows-pm-repo/vsCode-server/lwpm.yaml b/windows/lnmp-windows-pm-repo/vsCode-server/lwpm.yaml new file mode 100644 index 000000000..4b371369d --- /dev/null +++ b/windows/lnmp-windows-pm-repo/vsCode-server/lwpm.yaml @@ -0,0 +1,35 @@ +name: vscode-server +description: "" +version: "" +pre-version: "" +homepage: "" +bug: "" +github: "" +releases: "" +url: https://vscode.download.prss.microsoft.com/dbazure/download/stable/${VERSION}/vscode-server-win32-x64.zip +url-mirror: "" +pre-url: "" +pre-url-mirror: "" +command: "" +download-filename: "" +architecture: amd64 +os: windows +scripts: + get-version: | + $VERSION=$((code --version).split(' ')[1]) + preinstall: + - '_cleanup $HOME/.vscode-server/bin/vscode-server-win32-x64' + install: + - '_unzip $filename $HOME/.vscode-server/bin/' + - 'mv $HOME/.vscode-server/bin/vscode-server-win32-x64 $HOME/.vscode-server/bin/${VERSION}' + postinstall: "" + preuninstall: "" + uninstall: '_cleanup $HOME/.vscode-server/bin/${VERSION}' + postuninstall: "" + pruneuninstall: "" + pretest: "" + test: "" + posttest: "" + version: "" +path: +- C:\bin diff --git a/windows/lnmp-windows-pm-repo/wechatDevtool/lwpm.json b/windows/lnmp-windows-pm-repo/wechatDevtool/lwpm.json index 717241a6c..579219f22 100644 --- a/windows/lnmp-windows-pm-repo/wechatDevtool/lwpm.json +++ b/windows/lnmp-windows-pm-repo/wechatDevtool/lwpm.json @@ -1,8 +1,8 @@ { "name": "wechatDevtool", "description": "WeChat Dev tool", - "version": "1.06.2305042", - "pre-version": "1.06.2305042", + "version": "1.06.2402012", + "pre-version": "1.06.2402012", "homepage": "https://developers.weixin.qq.com/miniprogram/dev/devtools/devtools.html", "bug": "https://developers.weixin.qq.com/community/develop/question", "github": "wechat-miniprogram", diff --git a/windows/lnmp-windows-pm-repo/zeal/lwpm.json b/windows/lnmp-windows-pm-repo/zeal/lwpm.json index 48b32dd0f..f923dc18a 100644 --- a/windows/lnmp-windows-pm-repo/zeal/lwpm.json +++ b/windows/lnmp-windows-pm-repo/zeal/lwpm.json @@ -1,8 +1,8 @@ { "name": "zeal", "description": "Offline documentation browser inspired by Dash", - "version": "0.6.1", - "pre-version": "0.6.1", + "version": "0.7.0", + "pre-version": "0.7.0", "homepage": "https://zealdocs.org/", "bug": "https://github.com/zealdocs/zeal/issues", "github": "zealdocs/zeal", From 7108334d55d4a9afc4c812bcde5938680ba0cf88 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 18 Feb 2024 00:43:18 +0800 Subject: [PATCH 41/42] update folder Signed-off-by: Kang Huaishuai --- .env.example | 12 +- .env.example.ps1 | 9 + .env.global | 5 - TODO.md | 4 +- app/demo/public/index.php | 2 +- docker-lnmp.yml | 4 +- docker-production.yml | 2 +- docs/php_eol.md | 2 +- lnmp-docker | 218 +---------------- lnmp-docker.ps1 | 195 +-------------- scripts/.gitignore | 2 + scripts/RELEASE.md | 22 ++ scripts/cli/.env | 2 +- scripts/cli/.env.ps1 | 2 +- {cluster => scripts/cluster}/.gitignore | 2 + {cluster => scripts/cluster}/README.md | 0 scripts/cluster/cluster | 225 ++++++++++++++++++ scripts/cluster/cluster.ps1 | 203 ++++++++++++++++ .../cluster}/docker-cluster.memcached.yml | 0 .../cluster}/docker-cluster.mysql.yml | 0 .../cluster}/docker-cluster.nginx.yml | 0 .../docker-cluster.redis.replication.yml | 0 .../docker-cluster.redis.sentinel.yml | 0 .../cluster}/docker-cluster.redis.yml | 0 {cluster => scripts/cluster}/help.sh | 0 .../cluster}/mysql/master/master.sh | 0 .../cluster}/mysql/node/node.sh | 0 .../redis.sentinel/docker-entrypoint.redis.sh | 0 .../docker-entrypoint.sentinel.sh | 0 .../cluster}/redis/docker-entrypoint.sh | 0 {cluster => scripts/cluster}/redis/redis.conf | 0 secrets/.gitignore | 1 + {tls => secrets/tls}/.gitignore | 0 {tls => secrets/tls}/README.md | 0 {tls => secrets/tls}/cert/root-ca.crt | 0 {tls => secrets/tls}/cert/t.khs1994.com.crt | 0 {tls => secrets/tls}/cert/t.khs1994.com.key | 0 {tls => secrets/tls}/kustomization.yaml | 0 38 files changed, 489 insertions(+), 423 deletions(-) delete mode 100644 .env.global create mode 100644 scripts/RELEASE.md rename {cluster => scripts/cluster}/.gitignore (79%) rename {cluster => scripts/cluster}/README.md (100%) create mode 100644 scripts/cluster/cluster create mode 100644 scripts/cluster/cluster.ps1 rename {cluster => scripts/cluster}/docker-cluster.memcached.yml (100%) rename {cluster => scripts/cluster}/docker-cluster.mysql.yml (100%) rename {cluster => scripts/cluster}/docker-cluster.nginx.yml (100%) rename {cluster => scripts/cluster}/docker-cluster.redis.replication.yml (100%) rename {cluster => scripts/cluster}/docker-cluster.redis.sentinel.yml (100%) rename {cluster => scripts/cluster}/docker-cluster.redis.yml (100%) rename {cluster => scripts/cluster}/help.sh (100%) rename {cluster => scripts/cluster}/mysql/master/master.sh (100%) rename {cluster => scripts/cluster}/mysql/node/node.sh (100%) rename {cluster => scripts/cluster}/redis.sentinel/docker-entrypoint.redis.sh (100%) mode change 100755 => 100644 rename {cluster => scripts/cluster}/redis.sentinel/docker-entrypoint.sentinel.sh (100%) mode change 100755 => 100644 rename {cluster => scripts/cluster}/redis/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename {cluster => scripts/cluster}/redis/redis.conf (100%) rename {tls => secrets/tls}/.gitignore (100%) rename {tls => secrets/tls}/README.md (100%) rename {tls => secrets/tls}/cert/root-ca.crt (100%) rename {tls => secrets/tls}/cert/t.khs1994.com.crt (100%) rename {tls => secrets/tls}/cert/t.khs1994.com.key (100%) rename {tls => secrets/tls}/kustomization.yaml (100%) diff --git a/.env.example b/.env.example index 20e354413..245f26001 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,13 @@ +# 本项目全局变量 + +# 是否为国内环境，默认为 true，当处于非国内环境(例如：GitHub Actions)时请改为 false +LNMP_CN_ENV=true # true or false + + + +# end + + # https://docs.docker.com/compose/reference/envvars/ # [compose] @@ -243,4 +253,4 @@ LNMP_RESTART=always # 不过当daemon启动时，如果容器之前已经为停止状态，不要尝试启动它 ########################## Don't Edit ############################# -LNMP_DOCKER_VERSION= +LNMP_VERSION= diff --git a/.env.example.ps1 b/.env.example.ps1 index 1e4f2f529..a9928fc86 100644 --- a/.env.example.ps1 +++ b/.env.example.ps1 @@ -1,3 +1,12 @@ +# 本项目全局变量 + +# 是否为国内环境，默认为 true，当处于非国内环境(例如：GitHub Actions)时请改为 false +${env:LNMP_CN_ENV}=$true # true or false + + + +# end + # You can overwrite this file in .env.ps1 $CI_HOST="ci.khs1994.com:1218" diff --git a/.env.global b/.env.global deleted file mode 100644 index d25c10a5d..000000000 --- a/.env.global +++ /dev/null @@ -1,5 +0,0 @@ -# LNMP 使用的全局 环境变量 - -# 是否为国内环境，默认为 true，当处于非国内环境(例如：GitHub Actions)时改为 false -# true or false -LNMP_CN_ENV=true diff --git a/TODO.md b/TODO.md index 0f86ed164..994e8d76d 100644 --- a/TODO.md +++ b/TODO.md @@ -1,4 +1,4 @@ # TODO -* `lnmp-docker` 代码控制在 `1700` 行以内 -* `lnmp-docker.ps1` 代码控制在 `1300` 行以内 +* `lnmp-docker` 代码控制在 `1300` 行以内 +* `lnmp-docker.ps1` 代码控制在 `1200` 行以内 diff --git a/app/demo/public/index.php b/app/demo/public/index.php index 2a73bdc33..4416ed7b3 100644 --- a/app/demo/public/index.php +++ b/app/demo/public/index.php @@ -1,4 +1,4 @@ Date: Tue, 16 Jul 2024 23:18:01 +0800 Subject: [PATCH 42/42] Update Kubernetes v1.30.0 [sync git] Signed-off-by: Kang Huaishuai --- .env.example | 1 + CHANGELOG.md | 3 +++ dockerfile/php/nightly/cli/Dockerfile | 1 - dockerfile/php/nightly/fpm/Dockerfile | 1 - docs/windows/ssh.md | 5 +++++ kubernetes/.env.example | 2 +- kubernetes/.github/workflows/setup-k8s.yaml | 22 +++++++++---------- kubernetes/bin/lwpm.ps1 | 4 ++-- kubernetes/cfssl/Dockerfile | 2 +- kubernetes/docker-compose.bump.yml | 2 +- kubernetes/kubernetes-release/Dockerfile | 2 +- .../kubernetes-release/Dockerfile.buildx | 2 +- .../kubernetes-release/release/stable.txt | 2 +- kubernetes/rpi/README.md | 2 +- kubernetes/wsl2/00-README.NODE.md | 4 ++-- kubernetes/wsl2/00-README.SERVER.md | 4 ++-- .../lnmp-windows-pm-repo/k8s/crictl/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/crictl/lwpm.yml | 2 +- .../k8s/kubectl/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml | 2 +- .../k8s/kubernetes-node/lwpm.json | 2 +- .../k8s/kubernetes-node/lwpm.yml | 2 +- .../k8s/kubernetes-server/lwpm.json | 2 +- .../k8s/kubernetes-server/lwpm.yml | 2 +- 24 files changed, 41 insertions(+), 34 deletions(-) diff --git a/.env.example b/.env.example index 245f26001..030756bce 100644 --- a/.env.example +++ b/.env.example @@ -192,6 +192,7 @@ LNMP_LIBRARY_NS=library # 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 ## [PHP 项目文件路径（容器内路径）（绝对路径）] diff --git a/CHANGELOG.md b/CHANGELOG.md index b2cf0d39b..99fe13272 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ ### Changes: +* Switch **PHP** to `8.3.0` +* Kuberentes `v1.30.0` + ### Updates: * [PHP `8.3.0` `8.2.13` `8.1.26`](https://www.php.net/ChangeLog-8.php#8.1.26) diff --git a/dockerfile/php/nightly/cli/Dockerfile b/dockerfile/php/nightly/cli/Dockerfile index 44acbc91f..12a2dc692 100644 --- a/dockerfile/php/nightly/cli/Dockerfile +++ b/dockerfile/php/nightly/cli/Dockerfile @@ -32,7 +32,6 @@ ENV PHPIZE_DEPS \ file \ g++ \ gcc \ - libc-dev \ make \ pkgconf \ re2c diff --git a/dockerfile/php/nightly/fpm/Dockerfile b/dockerfile/php/nightly/fpm/Dockerfile index 478a5829c..b77e659af 100644 --- a/dockerfile/php/nightly/fpm/Dockerfile +++ b/dockerfile/php/nightly/fpm/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ file \ g++ \ gcc \ - libc-dev \ make \ pkgconf \ re2c diff --git a/docs/windows/ssh.md b/docs/windows/ssh.md index bcceda378..bac82140f 100644 --- a/docs/windows/ssh.md +++ b/docs/windows/ssh.md @@ -18,6 +18,11 @@ Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0 Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0 ``` +## 离线安装 + +* https://learn.microsoft.com/zh-cn/windows-server/administration/openssh/openssh_server_configuration +* https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH + ## 启动 ```powershell diff --git a/kubernetes/.env.example b/kubernetes/.env.example index d4f5bba02..92cd6198c 100644 --- a/kubernetes/.env.example +++ b/kubernetes/.env.example @@ -1,4 +1,4 @@ -KUBERNETES_VERSION=1.29.0 +KUBERNETES_VERSION=1.30.0 # KUBERNETES_VERSION= diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index 9f683f892..3a13d0b35 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -46,21 +46,21 @@ jobs: # next version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.30.0-alpha.2 + CI_KUBERNETES_VERSION: 1.31.0-alpha.3 LNMP_K8S_GET: --url GENERATE_CLI_HELP: "true" # current stable version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.29.0 + CI_KUBERNETES_VERSION: 1.30.0 LNMP_K8S_LOCAL_INSTALL_OPTIONS: --crio K8S_IMAGE_NS: khs1994 K8S_IMAGE_REGISTRY: useccr.ccs.tencentyun.com UPLOAD_TO_CODING: "true" - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.29.0 + CI_KUBERNETES_VERSION: 1.30.0 LNMP_K8S_GET: --url GENERATE_CLI_HELP: "true" @@ -69,12 +69,12 @@ jobs: # ipv6 # - os: ubuntu # dist: 20.04 - # CI_KUBERNETES_VERSION: 1.29.0 + # CI_KUBERNETES_VERSION: 1.30.0 # LNMP_K8S_GET: --url # IPV6: "true" - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.29.0 + CI_KUBERNETES_VERSION: 1.30.0 LNMP_K8S_GET: --url CNI_CALICO_EBPF: 'true' # v1.24.0+ not support docker @@ -84,21 +84,21 @@ jobs: # LNMP_K8S_LOCAL_INSTALL_OPTIONS: --docker - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.29.0 + CI_KUBERNETES_VERSION: 1.30.0 LNMP_K8S_GET: --url K8S_ROOT: /opt/k8s-custom # old version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.28.6 + CI_KUBERNETES_VERSION: 1.29.6 LNMP_K8S_GET: --url - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.27.10 + CI_KUBERNETES_VERSION: 1.28.11 LNMP_K8S_GET: --url - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.26.13 + CI_KUBERNETES_VERSION: 1.27.15 LNMP_K8S_GET: --url fail-fast: false steps: @@ -516,7 +516,7 @@ jobs: export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH BASE_BRANCH=master # BASE_BRANCH=v1.25.0-config - if ! [ $CI_KUBERNETES_VERSION = '1.29.0' -a "$GENERATE_CLI_HELP" = "true" ];then + if ! [ $CI_KUBERNETES_VERSION = '1.30.0' -a "$GENERATE_CLI_HELP" = "true" ];then exit 0 fi @@ -545,7 +545,7 @@ jobs: BASE_BRANCH=v1.29.0-alpha.1-config BASE_BRANCH=master # BASE_BRANCH=v1.28.0-config - if [ $CI_KUBERNETES_VERSION != '1.30.0-alpha.2' ];then + if [ $CI_KUBERNETES_VERSION != '1.31.0-alpha.3' ];then exit 0 fi diff --git a/kubernetes/bin/lwpm.ps1 b/kubernetes/bin/lwpm.ps1 index 98e33db71..bf98a9790 100644 --- a/kubernetes/bin/lwpm.ps1 +++ b/kubernetes/bin/lwpm.ps1 @@ -1,9 +1,9 @@ $env:LWPM_DOCKER_REGISTRY="mirror.ccs.tencentyun.com" ./lnmp/windows/lnmp-windows-pm.ps1 add ` - kubernetes-node@1.29.0 ` + kubernetes-node@1.30.0 ` --all-platform $env:LWPM_DOCKER_REGISTRY=$env:LWPM_DOCKER_REGISTRY_MIRROR -./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@1.29.0 +./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@1.30.0 diff --git a/kubernetes/cfssl/Dockerfile b/kubernetes/cfssl/Dockerfile index 9c959c817..ab0df0c9b 100644 --- a/kubernetes/cfssl/Dockerfile +++ b/kubernetes/cfssl/Dockerfile @@ -1,6 +1,6 @@ FROM --platform=${TARGETPLATFORM} alpine:edge as tool -ENV KUBECTL_VERSION=v1.29.0 +ENV KUBECTL_VERSION=v1.30.0 ARG TARGETARCH diff --git a/kubernetes/docker-compose.bump.yml b/kubernetes/docker-compose.bump.yml index 02704c1bb..10f045d62 100644 --- a/kubernetes/docker-compose.bump.yml +++ b/kubernetes/docker-compose.bump.yml @@ -1,6 +1,6 @@ services: k8s_apiserver: - image: registry.k8s.io/kube-apiserver:v1.29.0 + image: registry.k8s.io/kube-apiserver:v1.30.0 etcd: image: quay.io/coreos/etcd:v3.5.8 diff --git a/kubernetes/kubernetes-release/Dockerfile b/kubernetes/kubernetes-release/Dockerfile index 149922712..c90ea3a88 100644 --- a/kubernetes/kubernetes-release/Dockerfile +++ b/kubernetes/kubernetes-release/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV KUBERNETES_VERSION=v1.29.0 +ENV KUBERNETES_VERSION=v1.30.0 # ENV KUBERNETES_VERSION= diff --git a/kubernetes/kubernetes-release/Dockerfile.buildx b/kubernetes/kubernetes-release/Dockerfile.buildx index 13ab9f7cd..dd503baef 100644 --- a/kubernetes/kubernetes-release/Dockerfile.buildx +++ b/kubernetes/kubernetes-release/Dockerfile.buildx @@ -6,7 +6,7 @@ FROM alpine -ARG KUBERNETES_VERSION=v1.29.0 +ARG KUBERNETES_VERSION=v1.30.0 # ARG KUBERNETES_VERSION= diff --git a/kubernetes/kubernetes-release/release/stable.txt b/kubernetes/kubernetes-release/release/stable.txt index 9b277b94a..c8c2eaea5 100644 --- a/kubernetes/kubernetes-release/release/stable.txt +++ b/kubernetes/kubernetes-release/release/stable.txt @@ -1 +1 @@ -v1.29.0 +v1.30.0 diff --git a/kubernetes/rpi/README.md b/kubernetes/rpi/README.md index 30dce3a17..67aececcc 100644 --- a/kubernetes/rpi/README.md +++ b/kubernetes/rpi/README.md @@ -24,7 +24,7 @@ $ foreach($item in $items){scp ./wsl2/certs/$item pi@192.168.199.101:/home/pi/ln $ $items="kube-proxy","kubelet","kubectl","kubeadm","mounter" -$ foreach($item in $items){scp ./kubernetes-release/release/v1.29.0-linux-arm64/kubernetes/server/bin/$item pi@192.168.199.101:/home/pi/} +$ foreach($item in $items){scp ./kubernetes-release/release/v1.30.0-linux-arm64/kubernetes/server/bin/$item pi@192.168.199.101:/home/pi/} ``` ## 登录到树莓派 diff --git a/kubernetes/wsl2/00-README.NODE.md b/kubernetes/wsl2/00-README.NODE.md index c340c8d50..9da5efe20 100644 --- a/kubernetes/wsl2/00-README.NODE.md +++ b/kubernetes/wsl2/00-README.NODE.md @@ -44,8 +44,8 @@ $ ./wsl2/bin/kube-check $ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION" $ $env:K8S_ROOT="/wsl/wsl-k8s-data/k8s" -# 请将 1.29.0 替换为实际的 k8s 版本号 -$ $env:KUBERNETES_VERSION='1.29.0' +# 请将 1.30.0 替换为实际的 k8s 版本号 +$ $env:KUBERNETES_VERSION='1.30.0' $ wsl -d wsl-k8s -- sh -xc 'mkdir -p ${K8S_ROOT:?err}/bin' $ wsl -d wsl-k8s -- bash -xc 'cp -a kubernetes-release/release/v${KUBERNETES_VERSION}-linux-amd64/kubernetes/server/bin/{kube-proxy,kubectl,kubelet,kubeadm,mounter} ${K8S_ROOT:?err}/bin' diff --git a/kubernetes/wsl2/00-README.SERVER.md b/kubernetes/wsl2/00-README.SERVER.md index c9d093ac6..91392885e 100644 --- a/kubernetes/wsl2/00-README.SERVER.md +++ b/kubernetes/wsl2/00-README.SERVER.md @@ -211,8 +211,8 @@ $ wsl -d wsl-k8s -- sh -xc 'cp ${K8S_ROOT:?err}/etc/kubernetes/pki/*.yaml $ wsl -d wsl-k8s -- sh -xc 'cp ${K8S_ROOT:?err}/etc/kubernetes/pki/*.kubeconfig ${K8S_ROOT:?err}/etc/kubernetes' $ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION" -# 请将 1.29.0 替换为实际的 k8s 版本号 -$ $env:KUBERNETES_VERSION='1.29.0' +# 请将 1.30.0 替换为实际的 k8s 版本号 +$ $env:KUBERNETES_VERSION='1.30.0' $ wsl -d wsl-k8s -- bash -xc 'cp -a kubernetes-release/release/v${KUBERNETES_VERSION}-linux-amd64/kubernetes/server/bin/kube-{apiserver,controller-manager,scheduler} ${K8S_ROOT:?err}/bin' ``` diff --git a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json index e218883c4..85a79ac0f 100644 --- a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json @@ -29,5 +29,5 @@ }, "url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", "url-mirror": "https://${env:GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "version": "1.29.0" + "version": "1.30.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml index abca64cf2..7611f1a63 100644 --- a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml @@ -1,5 +1,5 @@ name: crictl -version: 1.29.0 +version: 1.30.0 url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" url-mirror: https://${env:GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz command: crictl diff --git a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json index 298101c85..d1a7a9b60 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json @@ -30,5 +30,5 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-client-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n", "install": "curl -L `\n https://mirror.azure.cn/kubernetes/kubectl/v${VERSION}/bin/windows/amd64/kubectl.exe `\n -o C:/bin/kubectl.exe\n" }, - "version": "1.29.0" + "version": "1.30.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml index a37e1e796..132ddeb20 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml @@ -1,5 +1,5 @@ name: kubectl -version: 1.29.0 +version: 1.30.0 # url: "https://mirror.azure.cn/kubernetes/kubectl/v${VERSION}/bin/linux/amd64/kubectl" # url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-client-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" scripts: diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json index bc9048874..67a126ce5 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json @@ -21,5 +21,5 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n" }, "url": "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-node-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "version": "1.29.0" + "version": "1.30.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml index eef1b318e..8eb130123 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml @@ -1,5 +1,5 @@ name: kubernetes-node -version: 1.29.0 +version: 1.30.0 url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-node-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" scripts: platform-reqs: if($IsMacOS){echo $False} diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json index 5c6b8d8a2..a569a0543 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json @@ -17,5 +17,5 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n" }, "url": "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-server-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "version": "1.29.0" + "version": "1.30.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml index 10a468e7c..82d145151 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml @@ -1,5 +1,5 @@ name: kubernetes-server -version: 1.29.0 +version: 1.30.0 url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-server-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" scripts: platform-reqs: if(!$IsLinux){echo $False}