Skip to content

Commit a52d8ce

Browse files
khs1994khs1994
committed
Update soft version [sync git]
Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>
1 parent d431438 commit a52d8ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+240
-274
lines changed

‎.env.example‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ TZ=Asia/Shanghai
113113

114114
# Soft Version
115115

116-
LNMP_NGINX_VERSION=1.19.4
116+
LNMP_NGINX_VERSION=1.19.5
117117

118118
LNMP_MYSQL_VERSION=8.0.22
119119

@@ -127,11 +127,11 @@ LNMP_PHP8_VERSION=8.0.0RC5
127127

128128
LNMP_REDIS_VERSION=6.0.9
129129

130-
LNMP_MEMCACHED_VERSION=1.6.8
130+
LNMP_MEMCACHED_VERSION=1.6.9
131131

132132
LNMP_PHPMYADMIN_VERSION=5.0.4
133133

134-
LNMP_NODE_VERSION=15.2.0
134+
LNMP_NODE_VERSION=15.3.0
135135

136136
# CONF FILE NAME
137137
#

‎.github/workflows/lwpm-dist-file.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: matrix.os == 'ubuntu' &&
4343
contains( github.event.head_commit.message, '[k8s]')
4444
env:
45-
VERSION: 1.4.1
45+
VERSION: 1.4.2
4646
run: |
4747
./lnmp/windows/lnmp-windows-pm.ps1 dist containerd@${env:VERSION}
4848
./lnmp/windows/lnmp-windows-pm.ps1 push containerd@${env:VERSION}

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
### Updates:
1414

1515
* [PHP `7.4.12` `7.3.24`](https://www.php.net/ChangeLog-7.php#7.4.12)
16-
* [NGINX `1.19.4`](https://nginx.org/en/CHANGES)
16+
* [NGINX `1.19.5`](https://nginx.org/en/CHANGES)

‎README.cn.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,15 +203,15 @@ $ ./lnmp-docker down
203203
|Name|Docker Image|Version|Based|
204204
|:-- |:-- |:-- |:-- |
205205
|[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:2.8.7` | **2.8.7** |`alpine:3.12` |
206-
|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.19.4-alpine` | **1.19.4** |`alpine:3.12` |
206+
|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.19.5-alpine` | **1.19.5** |`alpine:3.12` |
207207
|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:7.4.12-unit-alpine`| **1.21.0** |`alpine:3.12` |
208208
|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.46-alpine` | **2.4.46** |`alpine:3.12` |
209209
|[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.22` | **8.0.22** |`debian:buster-slim`|
210210
|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.5.8` | **10.5.8** |`ubuntu:focal` |
211211
|[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:6.0.9-alpine` | **6.0.9** |`alpine:3.12` |
212212
|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:7.4.12-fpm-alpine` | **7.4.12** |`alpine:3.11` |
213213
|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:7.4.12-composer-alpine`| **2.0.7** |`alpine:3.11` |
214-
|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.8-alpine` | **1.6.8** |`alpine:3.12` |
214+
|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.9-alpine` | **1.6.9** |`alpine:3.12` |
215215
|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.8.9-management-alpine` | **3.8.9** |`alpine:3.11` |
216216
|[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:13.1-alpine` | **13.1** |`alpine:3.12` |
217217
|[MongoDB](https://github.com/docker-library/docs/tree/master/mongo) |`mongo:4.4.2` | **4.4.2** |`ubuntu:bionic` |

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,15 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#%
199199
|Name|Docker Image|Version|Based|
200200
|:-- |:-- |:-- |:-- |
201201
|[ACME.sh](https://github.com/acmesh-official/acme.sh) |`khs1994/acme:2.8.7` | **2.8.7** |`alpine:3.12` |
202-
|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.19.4-alpine` | **1.19.4** |`alpine:3.12` |
202+
|[NGINX](https://github.com/khs1994-docker/nginx) |`nginx:1.19.5-alpine` | **1.19.5** |`alpine:3.12` |
203203
|[NGINX Unit](https://github.com/nginx/unit) |`khs1994/php:7.4.12-unit-alpine`| **1.21.0** |`alpine:3.12` |
204204
|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.46-alpine` | **2.4.46** |`alpine:3.12` |
205205
|[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.22` | **8.0.22** |`debian:buster-slim`|
206206
|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.5.8` | **10.5.8** |`ubuntu:focal` |
207207
|[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:6.0.9-alpine` | **6.0.9** |`alpine:3.12` |
208208
|[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:7.4.12-fpm-alpine` | **7.4.12** |`alpine:3.11` |
209209
|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:7.4.12-composer-alpine`| **2.0.7** |`alpine:3.11` |
210-
|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.8-alpine` | **1.6.8** |`alpine:3.12` |
210+
|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.9-alpine` | **1.6.9** |`alpine:3.12` |
211211
|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.8.9-management-alpine` | **3.8.9** |`alpine:3.11` |
212212
|[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:13.1-alpine` | **13.1** |`alpine:3.12` |
213213
|[MongoDB](https://github.com/docker-library/docs/tree/master/mongo) |`mongo:4.4.2` | **4.4.2** |`ubuntu:bionic` |

‎app/demo/.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ PHP_VERSION=7.4.12
77
# PHP_VERSION=7.0.33
88
# PHP_VERSION=5.6.40
99

10-
NODE_VERSION=15.2.0
10+
NODE_VERSION=15.3.0

‎app/demo/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
# !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !!
1010

11-
ARG NODE_VERSION=15.2.0
11+
ARG NODE_VERSION=15.3.0
1212
ARG PHP_VERSION=7.4.12
1313
ARG NGINX_VERSION=1.15.0
1414
ARG DOCKER_HUB_USERNAME=khs1994

‎app/demo/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ services:
4040
target: php
4141
args:
4242
- PHP_VERSION=${PHP_VERSION:-7.4.12}
43-
- NODE_VERSION=${NODE_VERSION:-15.2.0}
43+
- NODE_VERSION=${NODE_VERSION:-15.3.0}
4444
- NODE_REGISTRY=https://registry.npm.taobao.org
4545
image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-7.4.12}-pro-alpine

‎app/demo/docker-workspace.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ services:
7171
npm:
7272
<< : *workspace
7373
<< : *common
74-
image: node:15.2.0-alpine
74+
image: node:15.3.0-alpine
7575
entrypoint: npm
7676
command: [] # install | "run","dev" |
7777

‎app/laravel-demo/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
#
1414
# $ docker build --target=laravel -t khs1994/laravel:7 --build-arg NODE_REGISTRY=https://registry.npm.taobao.org --build-arg CI=false .
1515

16-
ARG NODE_VERSION=15.2.0
16+
ARG NODE_VERSION=15.3.0
1717
ARG PHP_VERSION=7.4.12
18-
ARG NGINX_VERSION=1.19.4-alpine
18+
ARG NGINX_VERSION=1.19.5-alpine
1919
ARG DOCKER_HUB_USERNAME=khs1994
2020

2121
# 1.前端构建
22-
FROM node:${NODE_VERSION:-15.2.0}-alpine as frontend
22+
FROM node:${NODE_VERSION:-15.3.0}-alpine as frontend
2323

2424
ARG NODE_REGISTRY=https://registry.npmjs.org
2525

0 commit comments

Comments
 (0)