Skip to content

Commit a22f8b7

Browse files
khs1994khs1994
authored
Release v17.09-rc11
Release v17.09-rc11 (#23)
1 parent c3fbd25 commit a22f8b7

21 files changed

+207
-38
lines changed

‎.env‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KHS1994_LNMP_DOCKER_VERSION=v17.09-rc10
1+
KHS1994_LNMP_DOCKER_VERSION=v17.09-rc11
22

33
# Docker Compose VAR
44

@@ -24,22 +24,24 @@ TZ=Asia/Shanghai
2424

2525
# Docker Image Tag 避免使用 latest 标签
2626

27-
KHS1994_LNMP_NGINX_VERSION=1.13.5
27+
KHS1994_LNMP_NGINX_VERSION=1.13.6
2828

2929
KHS1994_LNMP_MYSQL_VERSION=5.7.19
3030

3131
KHS1994_LNMP_REDIS_VERSION=4.0.2
3232

3333
KHS1994_LNMP_PHP_VERSION=7.1.10
3434

35-
KHS1994_LNMP_MEMCACHED_VERSION=1.5.1
35+
KHS1994_LNMP_MEMCACHED_VERSION=1.5.2
3636

3737
KHS1994_LNMP_RABBITMQ_VERSION=3.6.12
3838

3939
KHS1994_LNMP_POSTGRESQL_VERSION=10.0
4040

4141
KHS1994_LNMP_MONGODB_VERSION=3.5.13
4242

43+
KHS1994_LNMP_GOGS_VERSION=latest
44+
4345
# Docker Registry v2
4446

4547
REGISTRY_URL=docker.khs1994.com

‎Changelog.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,23 @@ Changelog
77

88
#### v17.09 rc11
99

10+
Changes:
11+
* Add `restart:always` in Docker Compose file
12+
* Add `Gogs`
13+
1014
Updates:
11-
* `PostgreSQL` 10.0
15+
* `Memcached` 1.5.2
16+
* `nginx` 1.13.6
1217

1318
#### v17.09 rc10
1419

1520
Bug fixes:
1621
* Fix git ssh-key CI/CD in `Production`
1722
* Fix MySQL backup and restore
1823

24+
Updates:
25+
* `PostgreSQL` 10.0
26+
1927
#### v17.09 rc9
2028

2129
Changes:

‎README.cn.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# LNMP Docker
22

3-
[![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)]() [![Build Status](https://travis-ci.org/khs1994-docker/lnmp.svg?branch=master)](https://travis-ci.org/khs1994-docker/lnmp) [![Build Status](https://travis-ci.org/khs1994-docker/lnmp.svg?branch=dev)](https://travis-ci.org/khs1994-docker/lnmp) [![GitHub tag](https://img.shields.io/github/tag/khs1994-docker/lnmp.svg)]() [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)]()
3+
[![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![Build Status](https://travis-ci.org/khs1994-docker/lnmp.svg?branch=master)](https://travis-ci.org/khs1994-docker/lnmp) [![Build Status](https://travis-ci.org/khs1994-docker/lnmp.svg?branch=dev)](https://travis-ci.org/khs1994-docker/lnmp) [![GitHub tag](https://img.shields.io/github/tag/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) [![GitHub last commit (branch)](https://img.shields.io/github/last-commit/khs1994-docker/lnmp/dev.svg)](https://github.com/khs1994-docker/lnmp/tree/dev)
44

55
使用 Docker Compose 快速搭建 LNMP 环境。
66

@@ -77,17 +77,17 @@ $ docker-compose down
7777

7878
|Name|Docker Image|Version|Based|
7979
|:-- |:-- |:-- |:-- |
80-
|[NGINX](https://github.com/khs1994-docker/nginx) |khs1994/nginx:1.13.5-alpine |`1.13.5` |Alpine|
80+
|[NGINX](https://github.com/khs1994-docker/nginx) |khs1994/nginx:1.13.5-alpine |`1.13.6` |Alpine:3.5|
8181
|MySQL |mysql:5.7.19 |`5.7.19` |Debian:jessie|
82-
|[Redis](https://github.com/khs1994-docker/redis) |khs1994/redis:4.0.2-alpine |`4.0.2` |Alpine|
83-
|[PHP-FPM](https://github.com/khs1994-docker/php-fpm) |khs1994/php-fpm:7.1.10-alpine |`7.1.10` |Alpine|
84-
|Laravel |khs1994/php-fpm:7.1.10-alpine |`5.5` |Alpine|
85-
|Composer |khs1994/php-fpm:7.1.10-alpine |`1.5.2` |Alpine|
86-
|[Memcached](https://github.com/khs1994-docker/memcached) |khs1994/memcached:1.5.1-alpine |`1.5.1` |Alpine|
87-
|[RabbitMQ](https://github.com/khs1994-docker/rabbitmq) |khs1994/rabbitmq:3.6.12-alpine |`3.6.12` |Alpine|
82+
|[Redis](https://github.com/khs1994-docker/redis) |khs1994/redis:4.0.2-alpine |`4.0.2` |Alpine:3.6|
83+
|[PHP-FPM](https://github.com/khs1994-docker/php-fpm) |khs1994/php-fpm:7.1.10-alpine |`7.1.10` |Alpine:3.4|
84+
|Laravel |khs1994/php-fpm:7.1.10-alpine |`5.5` |Alpine:3.4|
85+
|Composer |khs1994/php-fpm:7.1.10-alpine |`1.5.2` |Alpine:3.4|
86+
|[Memcached](https://github.com/khs1994-docker/memcached) |khs1994/memcached:1.5.2-alpine |`1.5.2` |Alpine:3.6|
87+
|[RabbitMQ](https://github.com/khs1994-docker/rabbitmq) |khs1994/rabbitmq:3.6.12-alpine |`3.6.12` |Alpine:3.5|
8888
|[PostgreSQL](https://github.com/khs1994-docker/postgres) |khs1994/postgres:10.0-alpine |`10.0` |Alpine:3.6|
8989
|MongoDB |mongo:3.5.13 |`3.5.13` |Debian:jessie|
90-
90+
|Gogs |gogs/gogs:latest |`latest` |Alpine:3.5|
9191

9292
## 文件夹结构
9393

‎README.md‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# LNMP Docker
22

3-
[![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)]() [![Build Status](https://travis-ci.org/khs1994-docker/lnmp.svg?branch=master)](https://travis-ci.org/khs1994-docker/lnmp) [![Build Status](https://travis-ci.org/khs1994-docker/lnmp.svg?branch=dev)](https://travis-ci.org/khs1994-docker/lnmp) [![GitHub tag](https://img.shields.io/github/tag/khs1994-docker/lnmp.svg)]() [![GitHub (pre-)release](https://img.shields.io/github/release/khs1994-docker/lnmp/all.svg)]()
3+
[![GitHub release](https://img.shields.io/github/release/khs1994-docker/lnmp.svg)](https://github.com/khs1994-docker/lnmp/releases) [![Build Status](https://travis-ci.org/khs1994-docker/lnmp.svg?branch=master)](https://travis-ci.org/khs1994-docker/lnmp) [![Build Status](https://travis-ci.org/khs1994-docker/lnmp.svg?branch=dev)](https://travis-ci.org/khs1994-docker/lnmp) [![GitHub tag](https://img.shields.io/github/tag/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) [![GitHub last commit (branch)](https://img.shields.io/github/last-commit/khs1994-docker/lnmp/dev.svg)](https://github.com/khs1994-docker/lnmp/tree/dev)
44

55
Build LNMP within 2 minutes powered by Docker Compose.
66

@@ -74,16 +74,17 @@ LNMP Docker is supported on Linux, macOS, Windows 10 (PC) on `x86_64`,and Debian
7474

7575
|Name|Docker Image|Version|Based|
7676
|:-- |:-- |:-- |:-- |
77-
|[NGINX](https://github.com/khs1994-docker/nginx) |khs1994/nginx:1.13.5-alpine |`1.13.5` |Alpine|
77+
|[NGINX](https://github.com/khs1994-docker/nginx) |khs1994/nginx:1.13.5-alpine |`1.13.6` |Alpine:3.5|
7878
|MySQL |mysql:5.7.19 |`5.7.19` |Debian:jessie|
79-
|[Redis](https://github.com/khs1994-docker/redis) |khs1994/redis:4.0.2-alpine |`4.0.2` |Alpine|
80-
|[PHP-FPM](https://github.com/khs1994-docker/php-fpm) |khs1994/php-fpm:7.1.10-alpine |`7.1.10` |Alpine|
81-
|Laravel |khs1994/php-fpm:7.1.10-alpine |`5.5` |Alpine|
82-
|Composer |khs1994/php-fpm:7.1.10-alpine |`1.5.2` |Alpine|
83-
|[Memcached](https://github.com/khs1994-docker/memcached) |khs1994/memcached:1.5.1-alpine |`1.5.1` |Alpine|
84-
|[RabbitMQ](https://github.com/khs1994-docker/rabbitmq) |khs1994/rabbitmq:3.6.12-alpine |`3.6.12` |Alpine|
79+
|[Redis](https://github.com/khs1994-docker/redis) |khs1994/redis:4.0.2-alpine |`4.0.2` |Alpine:3.6|
80+
|[PHP-FPM](https://github.com/khs1994-docker/php-fpm) |khs1994/php-fpm:7.1.10-alpine |`7.1.10` |Alpine:3.4|
81+
|Laravel |khs1994/php-fpm:7.1.10-alpine |`5.5` |Alpine:3.4|
82+
|Composer |khs1994/php-fpm:7.1.10-alpine |`1.5.2` |Alpine:3.4|
83+
|[Memcached](https://github.com/khs1994-docker/memcached) |khs1994/memcached:1.5.2-alpine |`1.5.2` |Alpine:3.6|
84+
|[RabbitMQ](https://github.com/khs1994-docker/rabbitmq) |khs1994/rabbitmq:3.6.12-alpine |`3.6.12` |Alpine:3.5|
8585
|[PostgreSQL](https://github.com/khs1994-docker/postgres) |khs1994/postgres:10.0-alpine |`10.0` |Alpine:3.6|
8686
|MongoDB |mongo:3.5.13 |`3.5.13` |Debian:jessie|
87+
|Gogs |gogs/gogs:latest |`latest` |Alpine:3.5|
8788

8889
## Folder Structure
8990

‎app/.env.development‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ APP_URL=http://localhost
88
DB_CONNECTION=mysql
99
DB_HOST=mysql
1010
DB_PORT=3306
11-
DB_DATABASE=laravel_blog_dev
11+
DB_DATABASE=laravel
1212
DB_USERNAME=root
1313
DB_PASSWORD=mytest
1414

@@ -31,3 +31,5 @@ MAIL_ENCRYPTION=null
3131
PUSHER_APP_ID=
3232
PUSHER_APP_KEY=
3333
PUSHER_APP_SECRET=
34+
35+
SESSION_DOMAIN=.khs1994.com

‎app/.env.production‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ APP_LOG_LEVEL=debug
66
APP_URL=http://localhost
77

88
DB_CONNECTION=mysql
9-
DB_HOST=172.17.0.1
9+
DB_HOST=mysql
1010
DB_PORT=3306
11-
DB_DATABASE=laravel_blog
11+
DB_DATABASE=laravel
1212
DB_USERNAME=root
1313
DB_PASSWORD=mytest
1414

@@ -17,7 +17,7 @@ CACHE_DRIVER=redis
1717
SESSION_DRIVER=redis
1818
QUEUE_DRIVER=sync
1919

20-
REDIS_HOST=127.0.0.1
20+
REDIS_HOST=redis
2121
REDIS_PASSWORD=null
2222
REDIS_PORT=6379
2323

@@ -31,3 +31,5 @@ MAIL_ENCRYPTION=null
3131
PUSHER_APP_ID=
3232
PUSHER_APP_KEY=
3333
PUSHER_APP_SECRET=
34+
35+
SESSION_DOMAIN=.khs1994.com

‎app/.env.staging‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
APP_NAME=Laravel
2+
APP_ENV=staging
3+
APP_KEY=base64:eZJ3iZOyDD+Tdec7thZ2kyPXQL/iW0QmPmEbf0AwHl8=
4+
APP_DEBUG=false
5+
APP_LOG_LEVEL=debug
6+
APP_URL=http://localhost
7+
8+
DB_CONNECTION=mysql
9+
DB_HOST=mysql
10+
DB_PORT=3306
11+
DB_DATABASE=laravel
12+
DB_USERNAME=root
13+
DB_PASSWORD=mytest
14+
15+
BROADCAST_DRIVER=log
16+
CACHE_DRIVER=redis
17+
SESSION_DRIVER=redis
18+
QUEUE_DRIVER=sync
19+
20+
REDIS_HOST=redis
21+
REDIS_PASSWORD=null
22+
REDIS_PORT=6379
23+
24+
MAIL_DRIVER=smtp
25+
MAIL_HOST=smtp.mailtrap.io
26+
MAIL_PORT=2525
27+
MAIL_USERNAME=null
28+
MAIL_PASSWORD=null
29+
MAIL_ENCRYPTION=null
30+
31+
PUSHER_APP_ID=
32+
PUSHER_APP_KEY=
33+
PUSHER_APP_SECRET=
34+
35+
SESSION_DOMAIN=.khs1994.com

‎app/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
!README.md
55
!.env.development
66
!.env.production
7+
!.env.staging

‎config/gogs/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
app.prod.ini

‎config/gogs/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Gogs
2+
3+
新建 `gogs` MySQL 数据库
4+
5+
```bash
6+
$ cp app.ini app.prod.ini
7+
```
8+
9+
修改 `app.prod.ini`

0 commit comments

Comments
 (0)