diff --git a/.editorconfig b/.editorconfig index e52fda9cb..6e0ff686b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,6 +6,8 @@ root = true indent_style = space +indent_size = 2 + charset = utf-8 trim_trailing_whitespace = true @@ -26,6 +28,10 @@ indent_size = 4 indent_size = 4 +[*.{go,java}] + +indent_size = 4 + [*.xml] indent_size = 4 @@ -34,10 +40,6 @@ indent_size = 4 indent_style = tab -[{package.json,.travis.yml,.khsci.yml,.drone.yml}] - -indent_size = 2 - -[*.js] +[{package.json,.travis.yml,.pcit.yml,.drone.yml}] indent_size = 2 diff --git a/.env.example b/.env.example index 8c5a99d43..535dc7d7a 100644 --- a/.env.example +++ b/.env.example @@ -104,11 +104,11 @@ LNMP_REGISTRY_HOST=docker.t.khs1994.com # Soft Version -LNMP_NGINX_VERSION=1.15.3 +LNMP_NGINX_VERSION=1.15.4 -LNMP_NGINX_UNIT_VERSION=1.3 +LNMP_NGINX_UNIT_VERSION=1.4 -LNMP_HTTPD_VERSION=2.4.34 +LNMP_HTTPD_VERSION=2.4.35 LNMP_MYSQL_VERSION=8.0.12 @@ -120,7 +120,7 @@ LNMP_PHP_VERSION=7.2.10 LNMP_MEMCACHED_VERSION=1.5.10 -LNMP_RABBITMQ_VERSION=3.7.6 +LNMP_RABBITMQ_VERSION=3.7.8 LNMP_POSTGRESQL_VERSION=10.4 diff --git a/.env.example.ps1 b/.env.example.ps1 index ef666012c..c877e3d18 100644 --- a/.env.example.ps1 +++ b/.env.example.ps1 @@ -39,13 +39,13 @@ $DistributionName="debian" $COMMON_SOFT="nginx","php","mysql","wsl-redis" -$global:NGINX_VERSION="1.15.3" +$global:NGINX_VERSION="1.15.4" # https://windows.php.net/download/ $global:PHP_VERSION="7.2.10" $global:MYSQL_VERSION="8.0.12" -$global:HTTPD_VERSION="2.4.34" +$global:HTTPD_VERSION="2.4.35" $global:IDEA_VERSION="1.11.4269" -$global:NODE_VERSION="10.10.0" +$global:NODE_VERSION="10.11.0" $global:GIT_VERSION="2.19.0" $global:PYTHON_VERSION="3.7.0" $global:GOLANG_VERSION="1.11" diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index 6cd54279d..9f9f1c13b 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -11,7 +11,7 @@ about: Create a report to help us improve ```bash $ cd lnmp -$ ./lnmp-docker.sh debug +$ ./lnmp-docker debug ``` 复制 `lnmp/debug.md` 内容到这里，并贴出终端执行内容及问题 diff --git a/README.cn.md b/README.cn.md index 04f6c3d35..f4879dd74 100644 --- a/README.cn.md +++ b/README.cn.md @@ -188,9 +188,9 @@ $ ./lnmp-docker down |Name|Docker Image|Version|Based| |:-- |:-- |:-- |:-- | |[ACME.sh](https://github.com/Neilpang/acme.sh) |`khs1994/acme:2.7.9` | **2.7.9** |`Alpine:3.8` | -|[NGINX](https://github.com/khs1994-website/tls-1.3) |`khs1994/nginx:1.15.3-alpine`| **1.15.3** |`Alpine:3.8` | +|[NGINX](https://github.com/khs1994-website/tls-1.3) |`khs1994/nginx:1.15.4-alpine`| **1.15.4** |`Alpine:3.8` | |[NGINX Unit](https://github.com/nginx/unit) |`khs1994/nginx-unit:1.3-alpine`| **1.3** |`Alpine:3.8` | -|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.34-alpine` | **2.4.34** |`Alpine:3.7` | +|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.35-alpine` | **2.4.35** |`Alpine:3.7` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.12` | **8.0.12** |`Debian:stretch`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.3.9` | **10.3.9** |`Ubuntu:bionic` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:5.0-rc5-alpine` | **5.0-rc5** |`Alpine:3.8` | @@ -199,7 +199,7 @@ $ ./lnmp-docker down |[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:7.2.10-fpm-alpine` | **1.7.2** |`Alpine:3.8` | |[PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) |`khs1994/php:7.2.10-fpm-alpine` | **2.13.0** |`Alpine:3.8` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.5.10-alpine` | **1.5.10** |`Alpine:3.8` | -|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.7.6-management-alpine` | **3.7.6** |`Alpine:3.8` | +|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.7.8-management-alpine` | **3.7.8** |`Alpine:3.8` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:10.4-alpine` | **10.4** |`Alpine:3.8` | |[MongoDB](https://github.com/docker-library/docs/tree/master/mongo) |`mongo:4.1.2` | **4.1.2** |`Ubuntu:xenial` | |[PHPMyAdmin](https://github.com/phpmyadmin/docker) | `phpmyadmin/phpmyadmin:latest` | **latest** |`Alpine:3.8` | diff --git a/README.md b/README.md index 4a34277f1..c6d868610 100644 --- a/README.md +++ b/README.md @@ -183,9 +183,9 @@ 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.9` | **2.7.9** |`Alpine:3.8` | -|[NGINX](https://github.com/khs1994-website/tls-1.3) |`khs1994/nginx:1.15.3-alpine`| **1.15.3** |`Alpine:3.8` | +|[NGINX](https://github.com/khs1994-website/tls-1.3) |`khs1994/nginx:1.15.4-alpine`| **1.15.4** |`Alpine:3.8` | |[NGINX Unit](https://github.com/nginx/unit) |`khs1994/nginx-unit:1.3-alpine`| **1.3** |`Alpine:3.8` | -|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.34-alpine` | **2.4.34** |`Alpine:3.7` | +|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd) |`httpd:2.4.35-alpine` | **2.4.35** |`Alpine:3.7` | |[MySQL](https://github.com/docker-library/docs/tree/master/mysql) |`mysql:8.0.12` | **8.0.12** |`Debian:stretch`| |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.3.9` | **10.3.9** |`Ubuntu:bionic` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:5.0-rc5-alpine` | **5.0-rc5** |`Alpine:3.8` | @@ -194,7 +194,7 @@ Please see [Documents](docs#%E6%BB%A1%E8%B6%B3-lnmp-%E5%BC%80%E5%8F%91%E5%85%A8% |[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:7.2.10-fpm-alpine` | **1.7.2** |`Alpine:3.8` | |[PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) |`khs1994/php:7.2.10-fpm-alpine` | **2.13.0** |`Alpine:3.8` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.5.10-alpine` | **1.5.10** |`Alpine:3.8` | -|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.7.6-management-alpine` | **3.7.6** |`Alpine:3.8` | +|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.7.8-management-alpine` | **3.7.8** |`Alpine:3.8` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:10.4-alpine` | **10.4** |`Alpine:3.8` | |[MongoDB](https://github.com/docker-library/docs/tree/master/mongo) |`mongo:4.1.2` | **4.1.2** |`Ubuntu:xenial` | |[PHPMyAdmin](https://github.com/phpmyadmin/docker) | `phpmyadmin/phpmyadmin:latest` | **latest** |`Alpine:3.8` | diff --git a/app/demo/.drone.yml b/app/demo/.drone.yml index 1e82e4da3..422843058 100644 --- a/app/demo/.drone.yml +++ b/app/demo/.drone.yml @@ -186,7 +186,7 @@ matrix: # - 7.0.32 # - 5.6.38 NGINX_VERSION: - - 1.15.3 + - 1.15.4 REDIS_VERSION: - 5.0-rc5-alpine MYSQL_VERSION: diff --git a/app/demo/.editorconfig b/app/demo/.editorconfig index 96a91f24c..6e0ff686b 100644 --- a/app/demo/.editorconfig +++ b/app/demo/.editorconfig @@ -6,6 +6,8 @@ root = true indent_style = space +indent_size = 2 + charset = utf-8 trim_trailing_whitespace = true @@ -16,17 +18,21 @@ end_of_line = lf [*.md] -trim_trailing_whitespace = false +trim_trailing_whitespace = true + +[*.py] + +indent_size = 4 [*.php] indent_size = 4 -[*.xml] +[*.{go,java}] indent_size = 4 -[*.py] +[*.xml] indent_size = 4 @@ -34,10 +40,6 @@ indent_size = 4 indent_style = tab -[{package.json,.travis.yml,.khsci.yml,.drone.yml}] - -indent_size = 2 - -[*.js] +[{package.json,.travis.yml,.pcit.yml,.drone.yml}] indent_size = 2 diff --git a/app/demo/.gitattributes.example b/app/demo/.gitattributes.example index 29bcc1ed4..81f0c2697 100644 --- a/app/demo/.gitattributes.example +++ b/app/demo/.gitattributes.example @@ -6,10 +6,13 @@ /tests export-ignore /.dockerignore export-ignore /.drone.yml export-ignore +/.editorconfig export-ignore /.gitattributes export-ignore /.gitignore export-ignore /.gitmodules export-ignore +/.php_cs export-ignore /.sami.php export-ignore +/.styleci.yml export-ignore /.travis.yml export-ignore .travis.yml export-ignore /CHANGELOG.md export-ignore diff --git a/app/demo/.gitignore b/app/demo/.gitignore index 14ee9c3bc..48ef645f3 100644 --- a/app/demo/.gitignore +++ b/app/demo/.gitignore @@ -19,8 +19,8 @@ __pycache__ # Sami -build -cache +/build +/cache # coerage report diff --git a/app/demo/.khsci.yml b/app/demo/.pcit.yml similarity index 92% rename from app/demo/.khsci.yml rename to app/demo/.pcit.yml index f6ebe6ed5..03c2ea89d 100644 --- a/app/demo/.khsci.yml +++ b/app/demo/.pcit.yml @@ -2,6 +2,12 @@ # @see https://github.com/khs1994-php/khsci/blob/master/docs/SUMMARY.md # +languages: php + +# cache: +# directories: +# - cache + workspace: base: /app # path: . @@ -72,7 +78,7 @@ pipeline: event: tag after_success: - image: bash + image: khs1994/php:${PHP_VERSION}-fpm-alpine shell: bash when: status: success @@ -110,7 +116,7 @@ services: # - POSTGRES_DB=test redis: - image: redis:${REDIS_VERSION} + image: redis:${REDIS_VERSION}-alpine command: ["--bind", "0.0.0.0"] # mongodb: @@ -126,9 +132,9 @@ matrix: # - 7.0.32 # - 5.6.38 NGINX_VERSION: - - 1.15.3 + - 1.15.4 REDIS_VERSION: - - 5.0-rc5-alpine + - 5.0-rc5 MYSQL_VERSION: # - 8.0.11 - 5.7.22 @@ -140,13 +146,3 @@ matrix: # branches: # include: [ master, dev, feature/* ] # exclude: [ release/1.0.0, release/1.1.* ] - -config: - aliyun: - docker_registry: - # registry: git_repo_full_name - khs1994/wsl: khs1994-php/khsci - - tencent_cloud: - docker_registry: - khs1994/wsl: khs1994-php/khsci diff --git a/app/demo/.travis.yml b/app/demo/.travis.yml index f519d3a9a..3ea21c62b 100644 --- a/app/demo/.travis.yml +++ b/app/demo/.travis.yml @@ -6,6 +6,7 @@ # language: php + # cache: # directories: # - cache @@ -13,6 +14,14 @@ language: php dist: xenial #16.04 # dist: trusty # 14.04 +# addons: +# apt: +# sources: +# - mysql-5.7-trusty +# packages: +# - mysql-server +# - mysql-client + sudo: required # services: # - docker @@ -63,8 +72,11 @@ before_install: - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS tests_tmp;' -U postgres; fi" - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'CREATE DATABASE tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'CREATE DATABASE tests_tmp;' -U postgres; fi" - - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS tests_tmp; CREATE DATABASE IF NOT EXISTS tests;'; fi" - sh -c "if [ '$ENABLE_MONGODB' = 'enable' ]; then mongo mydb_test --eval 'db.createUser({user:"travis",pwd:"test",roles:["readWrite"]});'; fi" + - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS tests_tmp; CREATE DATABASE IF NOT EXISTS tests;'; fi" + - if [ "$DB" = 'mysql' ]; then sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('new_password') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"; fi + - if [ "$DB" = 'mysql' ]; then sudo mysql_upgrade -u root -pnew_password; fi + - if [ "$DB" = 'mysql' ]; then sudo service mysql restart; fi - php .khsci.php - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini diff --git a/app/demo/docker-compose.yml b/app/demo/docker-compose.yml index 28cb94b90..584af4a42 100644 --- a/app/demo/docker-compose.yml +++ b/app/demo/docker-compose.yml @@ -35,9 +35,9 @@ services: context: . dockerfile: Dockerfile args: - - NGINX_VERSION=${NGINX_VERSION:-1.15.3}-alpine + - NGINX_VERSION=${NGINX_VERSION:-1.15.4}-alpine target: nginx - image: khs1994/nginx:${NGINX_VERSION:-1.15.3}-swarm-alpine + image: khs1994/nginx:${NGINX_VERSION:-1.15.4}-swarm-alpine depends_on: - 7_2_X # - 7_1_X diff --git a/cli/completion/bash/lnmp-docker b/cli/completion/bash/lnmp-docker index a85544112..f62f8dcc0 100644 --- a/cli/completion/bash/lnmp-docker +++ b/cli/completion/bash/lnmp-docker @@ -76,4 +76,4 @@ complete -W "acme.sh \ test \ cn-mirror \ compose \ - nfs" lnmp-docker.sh + nfs" lnmp-docker diff --git a/cli/install.txt b/cli/install.txt index 65aa2e7d2..cbaa80677 100644 --- a/cli/install.txt +++ b/cli/install.txt @@ -73,13 +73,13 @@ success(){ cd $LNMP_PATH which bash 2>&1 >/dev/null - if ! [ $? -eq 0 ];then sed -i "s/bin\/bash/bin\/sh/g" lnmp-docker.sh; fi + if ! [ $? -eq 0 ];then sed -i "s/bin\/bash/bin\/sh/g" lnmp-docker; fi echo "Success please exec $ cd ${LNMP_PATH} " -exec echo "$ ./lnmp-docker.sh development | production" +exec echo "$ ./lnmp-docker development | production" } error(){ diff --git a/docker-arm.yml b/docker-arm.yml index b858b5dc0..a7466fe4b 100644 --- a/docker-arm.yml +++ b/docker-arm.yml @@ -127,7 +127,7 @@ services: # << : *default-build # context: ./dockerfile/${ARM_ARCH:-arm64v8}/rabbitmq/ # dockerfile: Dockerfile - image: "${ARM_ARCH:-arm64v8}/rabbitmq:${LNMP_RABBITMQ_VERSION:-3.7.6}-management${ARM_BASED_OS}" + image: "${ARM_ARCH:-arm64v8}/rabbitmq:${LNMP_RABBITMQ_VERSION:-3.7.8}-management${ARM_BASED_OS}" volumes: - rabbitmq-data:/var/lib/rabbitmq - zoneinfo-data:/usr/share/zoneinfo @@ -217,7 +217,7 @@ services: # context: ./dockerfile/${ARM_ARCH:-arm64v8}/nginx/ # dockerfile: Dockerfile # image: lnmp-nginx:latest - image: "${ARM_ARCH:-arm64v8}/nginx:${LNMP_NGINX_VERSION:-1.15.3}" + image: "${ARM_ARCH:-arm64v8}/nginx:${LNMP_NGINX_VERSION:-1.15.4}" networks: - frontend ports: @@ -241,7 +241,7 @@ services: # context: ./dockerfile/${ARM_ARCH:-arm64v8}/httpd # dockerfile: Dockerfile # image: lnmp-httpd:latest - image: "${ARM_ARCH:-arm64v8}/httpd:${LNMP_HTTPD_VERSION:-2.4.34}${ARM_BASED_OS}" + image: "${ARM_ARCH:-arm64v8}/httpd:${LNMP_HTTPD_VERSION:-2.4.35}${ARM_BASED_OS}" ports: - "443:443" - "80:80" diff --git a/docker-cluster.nginx.yml b/docker-cluster.nginx.yml index 9266269b7..77a92b4a6 100644 --- a/docker-cluster.nginx.yml +++ b/docker-cluster.nginx.yml @@ -8,7 +8,7 @@ version: "3.7" x-common: &default-common - image: "khs1994/nginx:${LNMP_NGINX_VERSION:-1.15.3}-alpine" + image: "khs1994/nginx:${LNMP_NGINX_VERSION:-1.15.4}-alpine" restart: always env_file: ./cli/timezone.env networks: diff --git a/docker-compose.build.yml b/docker-compose.build.yml index 310f0f8fc..b877ef2cc 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -11,7 +11,7 @@ version: "3.7" # # $ cd ../../ # -# $ ./lnmp-docker.sh build [soft] +# $ ./lnmp-docker build [soft] # x-build: diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 320e6aac7..930ea08e9 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -50,15 +50,15 @@ services: nginx: << : *default-common - image: khs1994/nginx:${LNMP_NGINX_VERSION:-1.15.3}-alpine + image: khs1994/nginx:${LNMP_NGINX_VERSION:-1.15.4}-alpine nginx-unit: << : *default-common - image: khs1994/nginx-unit:${LNMP_NGINX_UNIT_VERSION:-1.3}-alpine + image: khs1994/nginx-unit:${LNMP_NGINX_UNIT_VERSION:-1.4}-alpine httpd: << : *default-common - image: httpd:${LNMP_HTTPD_VERSION:-2.4.34}-alpine + image: httpd:${LNMP_HTTPD_VERSION:-2.4.35}-alpine networks: frontend: diff --git a/docker-compose.yml b/docker-compose.yml index 25d540e8b..6b49f344c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -104,7 +104,7 @@ services: rabbitmq: << : *default-common - image: ${LNMP_SELF_BUILD_DOCKER_IMAGE_PREFIX:-khs1994}/rabbitmq:${LNMP_RABBITMQ_VERSION:-3.7.6}-management-alpine + image: ${LNMP_SELF_BUILD_DOCKER_IMAGE_PREFIX:-khs1994}/rabbitmq:${LNMP_RABBITMQ_VERSION:-3.7.8}-management-alpine volumes: - rabbitmq-data:/var/lib/rabbitmq - zoneinfo-data:/usr/share/zoneinfo @@ -186,7 +186,7 @@ services: nginx: << : *default-common - image: "${LNMP_SELF_BUILD_DOCKER_IMAGE_PREFIX:-khs1994}/nginx:${LNMP_NGINX_VERSION:-1.15.3}-alpine" + image: "${LNMP_SELF_BUILD_DOCKER_IMAGE_PREFIX:-khs1994}/nginx:${LNMP_NGINX_VERSION:-1.15.4}-alpine" ports: - "${LNMP_NGINX_HTTPS_PORT:-0.0.0.0:443}:443" - "${LNMP_NGINX_HTTP_PORT:-0.0.0.0:80}:80" @@ -206,7 +206,7 @@ services: nginx-unit: << : *default-common - image: "${LNMP_SELF_BUILD_DOCKER_IMAGE_PREFIX:-khs1994}/nginx-unit:${LNMP_NGINX_UNIT_VERSION:-1.3}-alpine" + image: "${LNMP_SELF_BUILD_DOCKER_IMAGE_PREFIX:-khs1994}/nginx-unit:${LNMP_NGINX_UNIT_VERSION:-1.4}-alpine" volumes: - ./config/${NGINX_UNIT_CONF:-nginx-unit}:/etc/nginx-unit:cached - ${APP_ROOT:-./app}:${LNMP_PHP_PATH:-/app}:cached @@ -235,7 +235,7 @@ services: httpd: << : *default-common - image: "${LNMP_SELF_BUILD_DOCKER_IMAGE_PREFIX:-khs1994}/httpd:${LNMP_HTTPD_VERSION:-2.4.34}-alpine" + image: "${LNMP_SELF_BUILD_DOCKER_IMAGE_PREFIX:-khs1994}/httpd:${LNMP_HTTPD_VERSION:-2.4.35}-alpine" ports: - "${LNMP_HTTPD_HTTPS_PORT:-0.0.0.0:443}:443" - "${LNMP_HTTPD_HTTP_PORT:-0.0.0.0:80}:80" diff --git a/docker-production.yml b/docker-production.yml index a08227e54..72b993a36 100644 --- a/docker-production.yml +++ b/docker-production.yml @@ -425,9 +425,9 @@ services: # # image: username/lnmp-nginx:tag # - # image: khs1994/lnmp-nginx:1.15.3 + # image: khs1994/lnmp-nginx:1.15.4 # - image: khs1994/nginx:1.15.3-alpine + image: khs1994/nginx:1.15.4-alpine ports: - "443:443" - "80:80" @@ -530,9 +530,9 @@ services: # # # # image: username/lnmp-httpd:tag # # - # # image: khs1994/lnmp-httpd:2.4.34 + # # image: khs1994/lnmp-httpd:2.4.35 # # - # image: "httpd:2.4.34-alpine" + # image: "httpd:2.4.35-alpine" # ports: # - "443:443" # - "80:80" diff --git a/docker-windows.yaml b/docker-windows.yaml index ad73f7ae4..a83fbb75a 100644 --- a/docker-windows.yaml +++ b/docker-windows.yaml @@ -2,7 +2,7 @@ version: "3.7" services: nginx: - image: khs1994/nginx:1.15.3-windowsservercore-1803 + image: khs1994/nginx:1.15.4-windowsservercore-1803 mysql: image: khs1994/mysql:8.0.12-windowsservercore-1803 diff --git a/dockerfile-windows/docker-compose.yaml b/dockerfile-windows/docker-compose.yaml index ad73f7ae4..a83fbb75a 100644 --- a/dockerfile-windows/docker-compose.yaml +++ b/dockerfile-windows/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3.7" services: nginx: - image: khs1994/nginx:1.15.3-windowsservercore-1803 + image: khs1994/nginx:1.15.4-windowsservercore-1803 mysql: image: khs1994/mysql:8.0.12-windowsservercore-1803 diff --git a/dockerfile-windows/nginx/Dockerfile b/dockerfile-windows/nginx/Dockerfile index dacfde37f..a604845aa 100644 --- a/dockerfile-windows/nginx/Dockerfile +++ b/dockerfile-windows/nginx/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/windowsservercore:1803 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV NGINX_VERSION 1.15.3 +ENV NGINX_VERSION 1.15.4 RUN $url = ('http://nginx.org/download/nginx-{0}.zip' -f $env:NGINX_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/dockerfile/README.md b/dockerfile/README.md index d4b622be6..cff3a8e60 100644 --- a/dockerfile/README.md +++ b/dockerfile/README.md @@ -17,7 +17,7 @@ $ docker-compose build ## BuildKit ```json -{"experimental":true, "features": {"feature-buildkit":true}} +{"experimental":true, "features":{"buildkit": true}} ``` ```bash diff --git a/dockerfile/httpd/.env.example b/dockerfile/httpd/.env.example index 83ae36bfe..28cc85252 100644 --- a/dockerfile/httpd/.env.example +++ b/dockerfile/httpd/.env.example @@ -1,2 +1,2 @@ DOCKER_HUB_USERNAME=khs1994 -TAG=2.4.34 +TAG=2.4.35 diff --git a/dockerfile/httpd/docker-compose.yml b/dockerfile/httpd/docker-compose.yml index b6fa2e0d3..41c6a25b1 100644 --- a/dockerfile/httpd/docker-compose.yml +++ b/dockerfile/httpd/docker-compose.yml @@ -6,4 +6,4 @@ services: context: . args: ALPINE_URL: mirrors.ustc.edu.cn - image: ${DOCKER_HUB_USERNAME:-khs1994}/httpd:${TAG:-2.4.34}-alpine + image: ${DOCKER_HUB_USERNAME:-khs1994}/httpd:${TAG:-2.4.35}-alpine diff --git a/dockerfile/httpd/example.Dockerfile b/dockerfile/httpd/example.Dockerfile index f329ceedb..cccdde998 100644 --- a/dockerfile/httpd/example.Dockerfile +++ b/dockerfile/httpd/example.Dockerfile @@ -1,4 +1,4 @@ -FROM httpd:2.4.34-alpine +FROM httpd:2.4.35-alpine LABEL maintainer="khs1994-docker/lnmp " diff --git a/dockerfile/nginx-unit/Dockerfile b/dockerfile/nginx-unit/Dockerfile index 35e42b1f1..cdfffce72 100644 --- a/dockerfile/nginx-unit/Dockerfile +++ b/dockerfile/nginx-unit/Dockerfile @@ -2,17 +2,19 @@ ARG PHP_VERSION=nightly FROM khs1994/php:${PHP_VERSION}-fpm-alpine -ARG NGINX_UNIT_VERSION=1.3 +ARG NGINX_UNIT_VERSION=1.4 + +ENV MODULE_NAME=php74 RUN git clone --depth=1 -b ${NGINX_UNIT_VERSION} https://github.com/nginx/unit /usr/src/unit \ - && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \ + && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS libressl-dev \ && cd /usr/local/lib \ && tar -zxvf libphp7.so.tar.gz \ && rm -rf *.tar.gz \ && cd /usr/src/unit \ - && ./configure --prefix=/usr/local/nginx-unit \ + && ./configure --prefix=/usr/local/nginx-unit --openssl \ && ./configure php \ - --module=php73 \ + --module=${MODULE_NAME} \ --lib-path=/usr/local/lib \ --config=/usr/local/bin/php-config \ && make \ diff --git a/dockerfile/nginx-unit/docker-compose.yml b/dockerfile/nginx-unit/docker-compose.yml index 9a04fc0de..53ff01588 100644 --- a/dockerfile/nginx-unit/docker-compose.yml +++ b/dockerfile/nginx-unit/docker-compose.yml @@ -3,4 +3,4 @@ version: "3.7" services: nginx-unit: build: . - image: khs1994/nginx-unit:1.3-alpine + image: khs1994/nginx-unit:1.4-alpine diff --git a/dockerfile/nginx/.env.example b/dockerfile/nginx/.env.example index 067cd6325..add1c9e9a 100644 --- a/dockerfile/nginx/.env.example +++ b/dockerfile/nginx/.env.example @@ -1 +1 @@ -NGINX_VERSION=1.15.3 +NGINX_VERSION=1.15.4 diff --git a/dockerfile/nginx/README.md b/dockerfile/nginx/README.md index 67ba4e33f..2f90505f5 100644 --- a/dockerfile/nginx/README.md +++ b/dockerfile/nginx/README.md @@ -8,8 +8,8 @@ | Verson | Details | | :------------- | :------------- | -| [![](https://images.microbadger.com/badges/version/khs1994/nginx:1.15.3-alpine.svg)](https://microbadger.com/images/khs1994/nginx:1.15.3-alpine "Get your own version badge on microbadger.com") | [![](https://images.microbadger.com/badges/image/khs1994/nginx:1.15.3-alpine.svg)](https://microbadger.com/images/khs1994/nginx:1.15.3-alpine "Get your own image badge on microbadger.com") | -|[![](https://images.microbadger.com/badges/version/khs1994/nginx:1.15.3-stretch.svg)](https://microbadger.com/images/khs1994/nginx:1.15.3-stretch "Get your own version badge on microbadger.com") | [![](https://images.microbadger.com/badges/image/khs1994/nginx:1.15.3-stretch.svg)](https://microbadger.com/images/khs1994/nginx:1.15.3-stretch "Get your own image badge on microbadger.com") | +| [![](https://images.microbadger.com/badges/version/khs1994/nginx:1.15.4-alpine.svg)](https://microbadger.com/images/khs1994/nginx:1.15.4-alpine "Get your own version badge on microbadger.com") | [![](https://images.microbadger.com/badges/image/khs1994/nginx:1.15.4-alpine.svg)](https://microbadger.com/images/khs1994/nginx:1.15.4-alpine "Get your own image badge on microbadger.com") | +|[![](https://images.microbadger.com/badges/version/khs1994/nginx:1.15.4-stretch.svg)](https://microbadger.com/images/khs1994/nginx:1.15.4-stretch "Get your own version badge on microbadger.com") | [![](https://images.microbadger.com/badges/image/khs1994/nginx:1.15.4-stretch.svg)](https://microbadger.com/images/khs1994/nginx:1.15.4-stretch "Get your own image badge on microbadger.com") | ## `Docker Compose` @@ -18,7 +18,7 @@ version: "3" services: nginx: - image: "khs1994/nginx:1.15.3-alpine" + image: "khs1994/nginx:1.15.4-alpine" ports: - "80:80" - "443:443" @@ -38,7 +38,7 @@ $ docker run -dit \ -p 443:443 \ -v $PWD/app:/app \ -v $PWD/conf.d:/etc/nginx/conf.d \ - khs1994/nginx:1.15.3-alpine + khs1994/nginx:1.15.4-alpine ``` # Who use it? diff --git a/dockerfile/nginx/alpine/Dockerfile b/dockerfile/nginx/alpine/Dockerfile index 0caad50b9..f7905034f 100644 --- a/dockerfile/nginx/alpine/Dockerfile +++ b/dockerfile/nginx/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.8 LABEL maintainer="khs1994.com nginx With TLSv1.3" -ARG NGINX_VERSION=1.15.3 +ARG NGINX_VERSION=1.15.4 ARG ALPINE_URL=dl-cdn.alpinelinux.org diff --git a/dockerfile/nginx/docker-compose.yml b/dockerfile/nginx/docker-compose.yml index 5d4623fec..b650694de 100644 --- a/dockerfile/nginx/docker-compose.yml +++ b/dockerfile/nginx/docker-compose.yml @@ -6,10 +6,10 @@ services: context: ./alpine args: # OPENSSL_BRANCH: master - NGINX_VERSION: ${NGINX_VERSION:-1.15.3} + NGINX_VERSION: ${NGINX_VERSION:-1.15.4} ALPINE_URL: mirrors.ustc.edu.cn # dl-cdn.alpinelinux.org OPENSSL_URL: https://gitee.com/mirrors/openssl.git - image: khs1994/nginx:${NGINX_VERSION:-1.15.3}-alpine + image: khs1994/nginx:${NGINX_VERSION:-1.15.4}-alpine ports: - 443:443 - 80:80 @@ -22,11 +22,11 @@ services: context: ./stretch args: # OPENSSL_BRANCH: master - NGINX_VERSION: ${NGINX_VERSION:-1.15.3} + NGINX_VERSION: ${NGINX_VERSION:-1.15.4} OPENSSL_URL: https://gitee.com/mirrors/openssl.git DEB_URL: mirrors.ustc.edu.cn # deb.debian.org DEB_SECURITY_URL: mirrors.ustc.edu.cn/debian-security # security.debian.org/debian-security - image: khs1994/nginx:${NGINX_VERSION:-1.15.3}-stretch + image: khs1994/nginx:${NGINX_VERSION:-1.15.4}-stretch ports: - 443:443 - 80:80 diff --git a/dockerfile/nginx/stretch/Dockerfile b/dockerfile/nginx/stretch/Dockerfile index 585be277e..10be73f6c 100644 --- a/dockerfile/nginx/stretch/Dockerfile +++ b/dockerfile/nginx/stretch/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stretch-slim -ARG NGINX_VERSION=1.15.3 +ARG NGINX_VERSION=1.15.4 ARG DEB_URL=deb.debian.org diff --git a/docs/README.md b/docs/README.md index 091b93046..81aa83bd5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -10,7 +10,7 @@ 在线阅读：[WebSite](https://doc.lnmp.khs1994.com/) -或在命令行执行 `./lnmp-docker.sh docs` 在本地阅读。 +或在命令行执行 `./lnmp-docker docs` 在本地阅读。 ## 版本策略 diff --git a/drone/.env.example b/drone/.env.example index 065c27253..1b3fe0fac 100644 --- a/drone/.env.example +++ b/drone/.env.example @@ -127,7 +127,7 @@ DRONE_GITLAB_URL= CI_DB_TYPE= CI_DRONE_VERSION=0.8.6 -CI_NGINX_VERSION=1.15.3 +CI_NGINX_VERSION=1.15.4 CI_REDIS_VERSION=5.0-rc4 CI_MYSQL_VERSION=8.0.12 diff --git a/drone/docker-compose.yml b/drone/docker-compose.yml index 7424a9492..a33cf652a 100644 --- a/drone/docker-compose.yml +++ b/drone/docker-compose.yml @@ -83,7 +83,7 @@ services: nginx: << : *default-common - image: khs1994/nginx:${CI_NGINX_VERSION:-1.15.3}-alpine + image: khs1994/nginx:${CI_NGINX_VERSION:-1.15.4}-alpine networks: - frontend ports: diff --git a/kubernetes/deployment/demo/lnmp-pod.yaml b/kubernetes/deployment/demo/lnmp-pod.yaml index 7021f1eb3..744dbff78 100644 --- a/kubernetes/deployment/demo/lnmp-pod.yaml +++ b/kubernetes/deployment/demo/lnmp-pod.yaml @@ -13,6 +13,6 @@ spec: - "bar.local" containers: - name: "lnmp-pod" - image: "khs1994/nginx:1.15.3-alpine" + image: "khs1994/nginx:1.15.4-alpine" # command: # args: diff --git a/kubernetes/deployment/lnmp-nginx.yaml b/kubernetes/deployment/lnmp-nginx.yaml index 41c966242..4904f86c2 100644 --- a/kubernetes/deployment/lnmp-nginx.yaml +++ b/kubernetes/deployment/lnmp-nginx.yaml @@ -36,7 +36,7 @@ spec: terminationGracePeriodSeconds: 60 containers: - name: lnmp-nginx - image: khs1994/nginx:1.15.3-alpine + image: khs1994/nginx:1.15.4-alpine imagePullPolicy: IfNotPresent # Always args: - nginx diff --git a/kubernetes/deployment/volumes/lnmp-volume-local.yaml b/kubernetes/deployment/volumes/lnmp-volume-local.yaml index 7c9849978..cdca73d16 100644 --- a/kubernetes/deployment/volumes/lnmp-volume-local.yaml +++ b/kubernetes/deployment/volumes/lnmp-volume-local.yaml @@ -45,7 +45,7 @@ metadata: spec: containers: - name: "lnmp-pod" - image: "khs1994/nginx:1.15.3-alpine" + image: "khs1994/nginx:1.15.4-alpine" volumeMounts: - name: lnmp-data mountPath: /app diff --git a/kubernetes/docs/addons/coredns.md b/kubernetes/docs/addons/coredns.md index 524b0b400..45566c01a 100644 --- a/kubernetes/docs/addons/coredns.md +++ b/kubernetes/docs/addons/coredns.md @@ -11,11 +11,11 @@ $ kubectl get all -n kube-system ## Test ```bash -$ kubectl run nginx --image=nginx:1.15.3-alpine +$ kubectl run nginx --image=nginx:1.15.4-alpine $ kubectl expose pod nginx -$ kubectl run nginx2 --image=nginx:1.15.3-alpine +$ kubectl run nginx2 --image=nginx:1.15.4-alpine $ kubectl exec nginx2 -i -t -- /bin/sh diff --git a/kubernetes/helm/nginx-php/values.yaml b/kubernetes/helm/nginx-php/values.yaml index 403181e71..f7d832c3e 100644 --- a/kubernetes/helm/nginx-php/values.yaml +++ b/kubernetes/helm/nginx-php/values.yaml @@ -27,7 +27,7 @@ nfs: server: 192.168.199.100 nginx: - image: khs1994/nginx:1.15.3-alpine + image: khs1994/nginx:1.15.4-alpine replicaCount: 2 php: diff --git a/linuxkit/lnmp.yml b/linuxkit/lnmp.yml index df7ec91bf..46e60c997 100644 --- a/linuxkit/lnmp.yml +++ b/linuxkit/lnmp.yml @@ -24,7 +24,7 @@ services: - name: rngd image: linuxkit/rngd:v0.2 - name: php7 - image: khs1994/php-fpm:swarm-7.2.5-alpine3.7 + image: khs1994/php:7.2.10-swarm-alpine capabilities: - CAP_NET_BIND_SERVICE - CAP_CHOWN @@ -52,7 +52,7 @@ services: # command: ["mysqld", "--character-set-server=utf8mb4","--default-authentication-plugin=mysql_native_password"] # net: host - name: redis - image: redis:5.0-rc3-alpine + image: redis:5.0-rc5-alpine capabilities: - CAP_NET_BIND_SERVICE - CAP_CHOWN @@ -66,7 +66,7 @@ services: - /etc/hosts:/etc/hosts net: host - name: nginx - image: khs1994/nginx:swarm-1.13.9-alpine + image: khs1994/nginx:1.15.4-swarm-alpine # env: # - TZ=Asia/Shanghai capabilities: diff --git a/pcit/README.md b/pcit/README.md index 6c77a39c5..25a449a43 100644 --- a/pcit/README.md +++ b/pcit/README.md @@ -32,7 +32,7 @@ 之后执行以下命令启动 `PCIT EE` ```bash -$ lnmp-docker.sh pcit-up +$ lnmp-docker pcit-up ``` ## 使用 diff --git a/scripts/issue_tls b/scripts/issue_tls index aa6b44f84..c686db68a 100644 --- a/scripts/issue_tls +++ b/scripts/issue_tls @@ -1,7 +1,7 @@ #!/bin/bash if [ $1 = 'rsa' ];then - lnmp-docker.sh ssl khs1994.com -d *.khs1994.com \ + lnmp-docker ssl khs1994.com -d *.khs1994.com \ -d *.developer.khs1994.com \ -d *.home.khs1994.com \ -d *.baidu.khs1994.com \ @@ -11,7 +11,7 @@ if [ $1 = 'rsa' ];then --rsa fi -lnmp-docker.sh ssl khs1994.com -d *.khs1994.com \ +lnmp-docker ssl khs1994.com -d *.khs1994.com \ -d *.developer.khs1994.com \ -d *.home.khs1994.com \ -d *.baidu.khs1994.com \ diff --git a/wsl/README.md b/wsl/README.md index f6a8581eb..3adcb8922 100644 --- a/wsl/README.md +++ b/wsl/README.md @@ -74,7 +74,7 @@ $ lnmp-wsl-install.sh enable php72 | php71 | php70 | php56 ## 特别注意 NGINX -NGINX 需要自己编译安装 `$ lnmp-wsl-builder-nginx.py 1.15.3 ROOT_PASSWORD` +NGINX 需要自己编译安装 `$ lnmp-wsl-builder-nginx.py 1.15.4 ROOT_PASSWORD` `/usr/local/etc/nginx/nginx.conf` 主配置文件必须添加下面的配置项，否则 PHP 页面打开非常缓慢 @@ -154,7 +154,7 @@ $ git clone --depth=1 https://github.com/nginx/unit $ cd unit -$ ./configure --prefix=/usr/local/nginx_unit +$ ./configure --prefix=/usr/local/nginx_unit --openssl # PHP 编译选项必须额外增加 --enable-embed=shared 选项，本文默认使用 $ lnmp-wsl-install.sh php 7.2.5 安装 PHP @@ -173,12 +173,21 @@ $ cd /usr/local/nginx_unit $ sudo ./sbin/unitd +# TLS (1.4 + support) + +$ cat cert.pem ca.pem key.pem > bundle.pem + +$ curl -X PUT --data-binary @bundle.pem 127.1:8443/certificates/cert_name + # 通过向 Linux Socket 发送 json 文件来配置 Unit { "listeners": { "*:8300": { - "application": "test" + "application": "test", + "tls": { + "certificate": "cert_name" + } } }, diff --git a/wsl/lnmp-wsl-builder-httpd.py b/wsl/lnmp-wsl-builder-httpd.py index a7e69325f..aae476209 100644 --- a/wsl/lnmp-wsl-builder-httpd.py +++ b/wsl/lnmp-wsl-builder-httpd.py @@ -13,7 +13,7 @@ def print_help_info(): Example: -$ lnmp-wsl-builder-httpd.py 2.4.34 root +$ lnmp-wsl-builder-httpd.py 2.4.35 root ''') diff --git a/wsl/lnmp-wsl-builder-nginx.py b/wsl/lnmp-wsl-builder-nginx.py index b91e82e58..ac9cd70ba 100644 --- a/wsl/lnmp-wsl-builder-nginx.py +++ b/wsl/lnmp-wsl-builder-nginx.py @@ -12,7 +12,7 @@ input_version = sys.argv[1] input_sudo = sys.argv[2] else: - wsl.print_help_info('lnmp-wsl-builder-nginx.py', 'NGINX', '1.15.3') + wsl.print_help_info('lnmp-wsl-builder-nginx.py', 'NGINX', '1.15.4') exit(0) sudo_cmd = 'echo ' + input_sudo + ' | sudo -S ' diff --git a/wsl/lnmp-wsl-install.sh b/wsl/lnmp-wsl-install.sh index f8dfa33d5..8f43d820d 100755 --- a/wsl/lnmp-wsl-install.sh +++ b/wsl/lnmp-wsl-install.sh @@ -53,7 +53,7 @@ GO_PREFIX=/usr/local GO_VERSION=1.11 -NODE_VERSION=10.10.0 +NODE_VERSION=10.11.0 NODE_PREFIX=/usr/local