Skip to content

Commit

Permalink
Resupport tlsv1.3 by khs1994/nginx:version-alpine #137
Browse files Browse the repository at this point in the history
  • Loading branch information
khs1994 committed Jun 12, 2018
1 parent 15844a5 commit a32a760
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 8 deletions.
6 changes: 5 additions & 1 deletion README.cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ $ ./lnmp-docker.sh down
|Name|Docker Image|Version|Based|
|:-- |:-- |:-- |:-- |
|[ACME.sh](https://github.com/Neilpang/acme.sh) |`khs1994/acme:2.7.8` | **2.7.8** |`Alpine:3.7` |
|[NGINX](https://github.com/docker-library/docs/tree/master/nginx) |`nginx:1.15.0-alpine` | **1.15.0** |`Alpine:3.7` |
|[NGINX](https://github.com/docker-library/docs/tree/master/nginx) |`khs1994/nginx:1.15.0-alpine` | **1.15.0** |`Alpine:3.7` |
|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.33-alpine` | **2.4.33** |`Alpine:3.7` |
|[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.11` | **8.0.11** |`Debian:stretch`|
|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.3.7` | **10.3.7** |`Debian:jessie` |
Expand Down Expand Up @@ -295,6 +295,10 @@ $ linuxkit run -publish 8080:80/tcp lnmp
* 码云:https://gitee.com/khs1994/lnmp.git
* Coding:https://git.coding.net/khs1994/lnmp.git

## TLS1.3

请查看 https://github.com/khs1994-docker/lnmp/issues/137

## CI/CD

请使用 [khs1994-docker/ci](https://github.com/khs1994-docker/ci)
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ Please see [Documents](docs#%E6%BB%A1%E8%B6%B3-lnmp-%E5%BC%80%E5%8F%91%E5%85%A8%
|Name|Docker Image|Version|Based|
|:-- |:-- |:-- |:-- |
|[ACME.sh](https://github.com/Neilpang/acme.sh) |`khs1994/acme:2.7.8` | **2.7.8** |`Alpine:3.7` |
|[NGINX](https://github.com/docker-library/docs/tree/master/nginx) |`nginx:1.15.0-alpine` | **1.15.0** |`Alpine:3.7` |
|[NGINX](https://github.com/docker-library/docs/tree/master/nginx) |`khs1994/nginx:1.15.0-alpine` | **1.15.0** |`Alpine:3.7` |
|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.33-alpine` | **2.4.33** |`Alpine:3.7` |
|[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.11` | **8.0.11** |`Debian:stretch`|
|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.3.7` | **10.3.7** |`Debian:jessie` |
Expand Down Expand Up @@ -281,6 +281,10 @@ Open your Browers `127.0.0.1:8080`

### [KhsCI](https://github.com/khs1994-php/khsci)

## TLS1.3

Please see https://github.com/khs1994-docker/lnmp/issues/137

## CI/CD

Please see [khs1994-docker/ci](https://github.com/khs1994-docker/ci)
Expand Down
2 changes: 1 addition & 1 deletion config/nginx
2 changes: 1 addition & 1 deletion docker-cluster.nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version: "3.6"

x-common:
&default-common
image: "nginx:${KHS1994_LNMP_NGINX_VERSION:-1.15.0}-alpine"
image: "khs1994/nginx:${KHS1994_LNMP_NGINX_VERSION:-1.15.0}-alpine"
restart: always
env_file: ./cli/timezone.env
networks:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:

nginx:
<< : *default-common
image: nginx:${KHS1994_LNMP_NGINX_VERSION:-1.15.0}-alpine
image: khs1994/nginx:${KHS1994_LNMP_NGINX_VERSION:-1.15.0}-alpine

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

nginx:
build: ./config/nginx
image: nginx:1.15.0-alpine
image: khs1994/nginx:1.15.0-alpine
# env_file: ./cli/timezone.env
ports:
- "443:443"
Expand Down
2 changes: 1 addition & 1 deletion docker-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ services:
#
# image: khs1994/lnmp-nginx:1.15.0
#
image: nginx:1.15.0-alpine
image: khs1994/nginx:1.15.0-alpine
ports:
- "443:443"
- "80:80"
Expand Down
2 changes: 1 addition & 1 deletion dockerfile/nginx-tls1.3

0 comments on commit a32a760

Please sign in to comment.