Skip to content

Commit

Permalink
[23.11] init v23.11
Browse files Browse the repository at this point in the history
Signed-off-by: Kang Huaishuai <[email protected]>
  • Loading branch information
khs1994 committed Feb 17, 2024
1 parent 1e3bc2d commit d9c79f1
Show file tree
Hide file tree
Showing 57 changed files with 145 additions and 135 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .env.example.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-lnmp/.github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
matrix:
lnmp_branch:
- 19.03
- "20.10"
- "23.11"
- master
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-lnmp/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-php/.github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
matrix:
php_version:
- nightly
- 8.2.13
- 8.3.0
- 8.1.26
- 8.0.30
# EOL
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-php/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-php/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
tags:
- '*'
branches:
- "20.10"
- "23.11"
workflow_dispatch:

name: Build Docs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lwpm-dist-file.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: LWPM Dist File
on:
push:
branches:
- "20.10"
- "23.11"
workflow_dispatch:

jobs:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
tags:
- v20.10.*
- v23.11.*
workflow_dispatch:

name: Release
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
tags:
- '*'
branches:
- "20.10"
- "23.11"
# paths:
# - '/.github/actions/*'
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-git.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
tags:
- '*'
branches:
- "20.10"
- "23.11"
workflow_dispatch:

name: Sync Git
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions .pcit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -18,4 +19,4 @@ steps:

branches:
- master
- "20.10"
- "23.11"
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# 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:

### Changes:

### 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)
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 在 [GitHub](https://github.com/khs1994-docker/lnmp/fork) 上点击 `fork` 按钮将本仓库 fork 到自己的仓库,如 `yourname/lnmp`,然后 `clone` 到本地。

```bash
$ git clone -b 20.10 [email protected]:yourname/lnmp.git
$ git clone -b 23.11 [email protected]:yourname/lnmp.git

$ cd lnmp

Expand All @@ -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
```
18 changes: 9 additions & 9 deletions README.cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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 | - |

<p align="center">
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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` |
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ 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)

:computer: :whale: :elephant: :dolphin: :penguin: :rocket: Start LNMP In Less than 2 minutes Powered By Docker Compose, **one command** `$ ./lnmp-docker up`

| 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) |

<p align="center">
<img width="600" src="https://user-images.githubusercontent.com/16733187/47264269-2467a780-d546-11e8-8cde-f63207ee28d9.jpg">
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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` |
Expand Down
Loading

0 comments on commit d9c79f1

Please sign in to comment.