Skip to content

Commit

Permalink
release v19.03.8
Browse files Browse the repository at this point in the history
Signed-off-by: Kang HuaiShuai <[email protected]>
  • Loading branch information
khs1994 committed Mar 21, 2020
1 parent c24c789 commit bc104a9
Show file tree
Hide file tree
Showing 18 changed files with 25 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ LNMP_PHP_VERSION=7.4.3

LNMP_REDIS_VERSION=5.0.8

LNMP_MEMCACHED_VERSION=1.6.0
LNMP_MEMCACHED_VERSION=1.6.1

LNMP_PHPMYADMIN_VERSION=latest

Expand Down
4 changes: 2 additions & 2 deletions .pcit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ workspace:
steps:
bash:
image: khs1994/php:7.4.3-composer-alpine
commands:
run:
- pwd
- bash ./lnmp-docker

# https://hub.docker.com/_/microsoft-powershell?tab=description
powershell:
image: mcr.azk8s.cn/powershell:preview-alpine-3.10
commands:
run:
- pwsh ./lnmp-docker.ps1

branches:
Expand Down
2 changes: 1 addition & 1 deletion README.cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ $ ./lnmp-docker down
|[Laravel](https://github.com/laravel/laravel) |`khs1994/php:7.4.3-composer-alpine` | **6.x** |`Alpine:3.11` |
|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:7.4.3-composer-alpine` | **1.10.0** |`Alpine:3.11` |
|[PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) |`khs1994/php-cs-fixer` | **2.16.1** |`Alpine:3.11` |
|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.0-alpine` | **1.6.0** |`Alpine:3.11` |
|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.1-alpine` | **1.6.1** |`Alpine:3.11` |
|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.8.3-management-alpine` | **3.8.3** |`Alpine:3.11` |
|[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:12.2-alpine` | **12.2** |`Alpine:3.11` |
|[MongoDB](https://github.com/docker-library/docs/tree/master/mongo) |`mongo:4.2.4` | **4.2.4** |`Ubuntu:bionic` |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/19.03/docs#%E
|[Laravel](https://github.com/laravel/laravel) |`khs1994/php:7.4.3-composer-alpine` | **6.x** |`Alpine:3.11` |
|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:7.4.3-composer-alpine` | **1.10.0** |`Alpine:3.11` |
|[PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) |`khs1994/php-cs-fixer` | **2.16.1** |`Alpine:3.11` |
|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.0-alpine` | **1.6.0** |`Alpine:3.11` |
|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.1-alpine` | **1.6.1** |`Alpine:3.11` |
|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.8.3-management-alpine` | **3.8.3** |`Alpine:3.11` |
|[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:12.2-alpine` | **12.2** |`Alpine:3.11` |
|[MongoDB](https://github.com/docker-library/docs/tree/master/mongo) |`mongo:4.2.4` | **4.2.4** |`Ubuntu:bionic` |
Expand Down
2 changes: 1 addition & 1 deletion cluster/docker-cluster.memcached.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version: "3.7"

x-common:
&default-common
image: memcached:1.6.0-alpine
image: memcached:1.6.1-alpine
restart: always
networks:
- cluster_memcached
Expand Down
2 changes: 1 addition & 1 deletion config/nginx/demo-registry.config
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ server {

location /v2/ {
# Do not allow connections from docker 1.5 and earlier
# docker pre-1.6.0 did not properly set the user agent on ping, catch "Go *" user agents
# docker pre-1.6.1 did not properly set the user agent on ping, catch "Go *" user agents
if ($http_user_agent ~ "^(docker\/1\.(3|4|5(?!\.[0-9]-dev))|Go ).*$" ) {
return 404;
}
Expand Down
2 changes: 1 addition & 1 deletion docker-lnmp.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:

memcached:
<< : *default-common
image: memcached:${LNMP_MEMCACHED_VERSION:-1.6.0}-alpine
image: memcached:${LNMP_MEMCACHED_VERSION:-1.6.1}-alpine

php7:
<< : *default-common
Expand Down
2 changes: 1 addition & 1 deletion docker-lnmp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ services:

memcached:
<< : *default-common
image: ${LNMP_BUILD_DOCKER_IMAGE_PREFIX:-khs1994}/memcached:${LNMP_MEMCACHED_VERSION:-1.6.0}-alpine
image: ${LNMP_BUILD_DOCKER_IMAGE_PREFIX:-khs1994}/memcached:${LNMP_MEMCACHED_VERSION:-1.6.1}-alpine
ports:
- "${LNMP_MEMCACHED_PORT:-127.0.0.1:11211}:11211"
volumes:
Expand Down
8 changes: 2 additions & 6 deletions docs/install/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ $ ./lnmp-docker.ps1 up

**在 WSL 执行 Docker CLI 命令,不是在 WSL 运行 Docker 服务端**

> 不建议使用,请使用 [WSL2](https://github.com/khs1994-docker/lnmp/blob/19.03/wsl2/README.DOCKER.md)

* https://github.com/khs1994-docker/lnmp/blob/master/wsl/config/wsl.conf

默认的 WSL 将 C 盘挂载到了 `/mnt/c`,这里修改配置,将 C 盘挂载到 `/c`

### 1. 设置 Windows PATH 变量

```powershell
Expand All @@ -64,6 +58,8 @@ $ lnmp-wsl-docker-cli.sh

### 3. 设置挂载路径

默认的 WSL 将 C 盘挂载到了 `/mnt/c`,这里修改配置,将 C 盘挂载到 `/c`

* https://raw.githubusercontent.com/khs1994-docker/lnmp/master/wsl/config/wsl.conf

WSL 中执行
Expand Down
2 changes: 1 addition & 1 deletion drone/config/nginx/demo-docker-registry.config
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ server {

location /v2/ {
# Do not allow connections from docker 1.5 and earlier
# docker pre-1.6.0 did not properly set the user agent on ping, catch "Go *" user agents
# docker pre-1.6.1 did not properly set the user agent on ping, catch "Go *" user agents
if ($http_user_agent ~ "^(docker\/1\.(3|4|5(?!\.[0-9]-dev))|Go ).*$" ) {
return 404;
}
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LNMP_HTTPS_PORT=443

# soft version

ETCD_VERSION=3.4.4
ETCD_VERSION=3.4.5
HELM_VERSION=3.0.3
CNI_VERSION=0.8.5
CRICTL_VERSION=1.17.0
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/bin/fcos-etcdctl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exec podman run --rm --network host --privileged \
-v ${K8S_ROOT:-/opt/k8s}/certs:${K8S_ROOT:-/opt/k8s}/certs \
-e ETCDCTL_API \
gcr.azk8s.cn/etcd-development/etcd:v${ETCD_VERSION:-3.4.4} \
gcr.azk8s.cn/etcd-development/etcd:v${ETCD_VERSION:-3.4.5} \
etcdctl \
--endpoints=$etcd_endpoints \
--cacert="${K8S_ROOT:-/opt/k8s}/certs/ca.pem" \
Expand Down
2 changes: 1 addition & 1 deletion lnmp-docker.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

<#PSScriptInfo

.VERSION 19.03.8-alpha1
.VERSION 19.03.8

.GUID 9769fa4f-70c7-43ed-8d2b-a0018f7dc89f

Expand Down
6 changes: 3 additions & 3 deletions scripts/docker-compose.bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
image: redis:5.0.8-alpine

memcached:
image: memcached:1.6.0-alpine
image: memcached:1.6.1-alpine

php:
image: php:7.4.3-fpm-alpine
Expand All @@ -38,7 +38,7 @@ services:
image: httpd:2.4.41-alpine

etcd:
image: quay.io/coreos/etcd:3.4.4
image: quay.io/coreos/etcd:3.4.5

minio:
image: minio/minio:RELEASE.2020-03-14T02-21-58Z
Expand All @@ -50,7 +50,7 @@ services:
image: node:13.10.1-alpine

go:
image: golang:1.14.0-alpine
image: golang:1.14.1-alpine

alpine:
image: alpine:3.11
Expand Down
4 changes: 2 additions & 2 deletions windows/lnmp-windows-pm-repo/etcd/lwpm.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "etcd",
"description": "Distributed reliable key-value store for the most critical data of a distributed system",
"version": "3.4.4",
"preVersion": "3.4.4",
"version": "3.4.5",
"preVersion": "3.4.5",
"homepage": "https://etcd.io/",
"bug": "https://github.com/etcd-io/etcd/issues",
"github": "etcd-io/etcd",
Expand Down
4 changes: 2 additions & 2 deletions windows/lnmp-windows-pm-repo/go/lwpm.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "go",
"description": "Go is an open source programming language that makes it easy to build simple, reliable, and efficient software",
"version": "1.14",
"preVersion": "1.14",
"version": "1.14.1",
"preVersion": "1.14.1",
"homepage": "https://golang.google.cn/",
"bug": "https://github.com/golang/go/issues",
"github": "golang/go",
Expand Down
4 changes: 2 additions & 2 deletions windows/lnmp-windows-pm-repo/wechatDevtool/lwpm.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "wechatDevtool",
"description": "WeChat Dev tool",
"version": "1.02.2003112",
"preVersion": "1.02.2003112",
"version": "1.02.2003202",
"preVersion": "1.02.2003202",
"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",
Expand Down
2 changes: 1 addition & 1 deletion wsl/lnmp-wsl-install
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ PG_MAJOR=10

GO_PREFIX=/usr/local

GO_VERSION=1.14
GO_VERSION=1.14.1

NODE_VERSION=13.10.1

Expand Down

0 comments on commit bc104a9

Please sign in to comment.