Skip to content

Commit 9d11b9a

Browse files
khs1994khs1994
authored
Release v18.05
Release v18.05 (#362)
1 parent 53b5b69 commit 9d11b9a

File tree

7 files changed

+42
-12
lines changed

7 files changed

+42
-12
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Changes:
2525
* Add `compose` default value #241 #242
2626
* Add disable `redis` rdb command
2727
* Add Windows `mysql` conf #334 #335 #336
28-
* Add `WSL` php-builder script #340 #346 #347 #358
28+
* Add `WSL` php-builder script #340 #346 #347 #358 #359
2929
* Update Docker CE 18.03 Stable + Docker Compose 1.20.1 #313
3030
* Update `docs`
3131
* Update `compose file` #252
@@ -63,6 +63,8 @@ Updates:
6363
* mongodb `3.7.3` #297
6464
* Redis `4.0.9` #330
6565

66+
#### [v18.03 (2018-03-11) EOL](https://github.com/khs1994-docker/lnmp/releases/tag/v18.03)
67+
6668
#### [v18.02 (2018-02-01) EOL](https://github.com/khs1994-docker/lnmp/releases/tag/v18.02)
6769

6870
#### [v18.01 (2018-01-12) EOL](https://github.com/khs1994-docker/lnmp/releases/tag/v18.01)

‎README.cn.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ $ ./lnmp-docker.sh development
8383

8484
$ curl 127.0.0.1
8585

86-
Welcome use khs1994-docker/lnmp v18.03 x86_64 With Pull Docker Image
86+
Welcome use khs1994-docker/lnmp v18.05 x86_64 With Pull Docker Image
8787

8888
development
8989

@@ -167,9 +167,9 @@ $ ./lnmp-docker.sh down
167167

168168
每月更新版本，版本命名方式为 `YY.MM`，更新记录请查看 [Releases](https://github.com/khs1994-docker/lnmp/releases)。
169169

170-
* [v18.03 2018-03-11](https://github.com/khs1994-docker/lnmp/releases/tag/v18.03)
170+
* [v18.05 2018-04-01](https://github.com/khs1994-docker/lnmp/releases/tag/v18.05)
171171

172-
* ~~[v18.02 2018-02-01](https://github.com/khs1994-docker/lnmp/releases/tag/v18.02) **EOL**~~
172+
* ~~[v18.03 2018-03-11](https://github.com/khs1994-docker/lnmp/releases/tag/v18.03) **EOL**~~
173173

174174
## 项目说明
175175

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $ ./lnmp-docker.sh development
8181

8282
$ curl 127.0.0.1
8383

84-
Welcome use khs1994-docker/lnmp v18.03 x86_64 With Pull Docker Image
84+
Welcome use khs1994-docker/lnmp v18.05 x86_64 With Pull Docker Image
8585

8686
development
8787

@@ -162,9 +162,9 @@ $ ./lnmp-docker.sh down
162162

163163
Updates every month, Version name is `YY.MM`. For more release information about LNMP Docker Version, see [Releases](https://github.com/khs1994-docker/lnmp/releases).
164164

165-
* [v18.03 2018-03-11](https://github.com/khs1994-docker/lnmp/releases/tag/v18.03)
165+
* [v18.05 2018-04-01](https://github.com/khs1994-docker/lnmp/releases/tag/v18.05)
166166

167-
* ~~[v18.02 2018-02-01](https://github.com/khs1994-docker/lnmp/releases/tag/v18.02) **EOL**~~
167+
* ~~[v18.03 2018-03-11](https://github.com/khs1994-docker/lnmp/releases/tag/v18.03) **EOL**~~
168168

169169
## Overview
170170

‎wsl/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ COPY --from=memcached:1.5.6 /usr/local/bin/memcached ${PHP_PREFIX}/bin/
283283

284284
RUN cd /usr/local ; tar -zcvf wsl-php72.tar.gz php72 ; cd etc ; tar -zcvf wsl-php72-etc.tar.gz php72
285285

286-
FROM hello-world
286+
FROM hello-world:latest@sha256:97ce6fa4b6cdc0790cda65fe7290b74cfebd9fa0c9b8c38e979330d547d22ce1
287287

288288
# scratch
289289

‎wsl/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,14 @@ export APP_ENV=wsl
4444

4545
如果你不想编译安装，那么我写了一个脚本 （**脚本** 从 Docker 复制编译好的软件到 WSL ，或设置 apt 从软件源安装）。
4646

47+
* https://store.docker.com/community/images/khs1994/wsl/tags
48+
4749
```bash
4850
$ lnmp-wsl-install.sh nginx | php | mysql ...
4951
```
5052

53+
* PHP 版本问题：https://github.com/khs1994-docker/lnmp/issues/348
54+
5155
## 特别注意 NGINX
5256

5357
`/etc/nginx/nginx.conf` 主配置文件必须添加下面的配置项，否则 PHP 页面打开非常缓慢

‎wsl/lnmp-wsl-php-builder-rhel.sh‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ set -ex
66
# Build php in WSL(Debian Ubuntu)
77
#
88

9+
PHP_TIMEZONE=PRC
10+
911
command -v wget || ( sudo yum -y update && sudo yum install wget -y)
1012

1113
# epel
@@ -320,10 +322,12 @@ done
320322
if [ ${PHP_NUM} -ge 72 ];then
321323

322324
echo "zend_extension=opcache" | sudo tee ${PHP_INI_DIR}/conf.d/extension-opcache.ini
325+
echo "date.timezone=${PHP_TIMEZONE:-PRC}" | sudo tee ${PHP_INI_DIR}/conf.d/date_timezone.ini
323326

324327
else
325328

326329
echo "zend_extension=opcache.so" | sudo tee ${PHP_INI_DIR}/conf.d/extension-opcache.ini
330+
echo "date.timezone=${PHP_TIMEZONE:-PRC}" | sudo tee ${PHP_INI_DIR}/conf.d/date_timezone.ini
327331

328332
fi
329333

@@ -402,19 +406,27 @@ ${PHP_ROOT}/sbin/php-fpm -v | sudo tee -a ${PHP_ROOT}/README.md
402406

403407
echo "\`\`\`" | sudo tee -a ${PHP_ROOT}/README.md
404408

409+
echo "\`\`\`bash" | sudo tee -a ${PHP_ROOT}/README.md
410+
411+
cat ${PHP_INSTALL_LOG} | sudo tee -a ${PHP_ROOT}/README.md
412+
413+
echo "\`\`\`" | sudo tee -a ${PHP_ROOT}/README.md
414+
405415
for ext in `ls /usr/local/src/php-${PHP_VERSION}/ext`; \
406416
do echo '*' $( ${PHP_ROOT}/bin/php -r "if(extension_loaded('$ext')){echo '[x] $ext';}else{echo '[ ] $ext';}" ) | sudo tee -a ${PHP_ROOT}/README.md ; done
407417

408418
set -x
409419

420+
cat ${PHP_ROOT}/README.md
421+
410422
if [ "$2" = 'tar' ];then
411423
cd /usr/local
412424

413-
sudo tar -zxvf php${PHP_NUM}.tar.gz php${PHP_NUM}
425+
sudo tar -zcvf php${PHP_NUM}.tar.gz php${PHP_NUM}
414426

415427
cd etc
416428

417-
sudo tar -zxvf php${PHP_NUM}-etc.tar.gz php${PHP_NUM}
429+
sudo tar -zcvf php${PHP_NUM}-etc.tar.gz php${PHP_NUM}
418430

419431
sudo mv /usr/local/php${PHP_NUM}.tar.gz /
420432

‎wsl/lnmp-wsl-php-builder.sh‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ set -ex
66
# Build php in WSL(Debian Ubuntu)
77
#
88

9+
PHP_TIMEZONE=PRC
10+
911
command -v wget || ( sudo apt update && sudo apt install wget -y)
1012

1113
PHP_URL=http://cn2.php.net/distributions
@@ -325,10 +327,12 @@ done
325327
if [ ${PHP_NUM} -ge 72 ];then
326328

327329
echo "zend_extension=opcache" | sudo tee ${PHP_INI_DIR}/conf.d/extension-opcache.ini
330+
echo "date.timezone=${PHP_TIMEZONE:-PRC}" | sudo tee ${PHP_INI_DIR}/conf.d/date_timezone.ini
328331

329332
else
330333

331334
echo "zend_extension=opcache.so" | sudo tee ${PHP_INI_DIR}/conf.d/extension-opcache.ini
335+
echo "date.timezone=${PHP_TIMEZONE:-PRC}" | sudo tee ${PHP_INI_DIR}/conf.d/date_timezone.ini
332336

333337
fi
334338

@@ -407,19 +411,27 @@ ${PHP_ROOT}/sbin/php-fpm -v | sudo tee -a ${PHP_ROOT}/README.md
407411

408412
echo "\`\`\`" | sudo tee -a ${PHP_ROOT}/README.md
409413

414+
echo "\`\`\`bash" | sudo tee -a ${PHP_ROOT}/README.md
415+
416+
cat ${PHP_INSTALL_LOG} | sudo tee -a ${PHP_ROOT}/README.md
417+
418+
echo "\`\`\`" | sudo tee -a ${PHP_ROOT}/README.md
419+
410420
for ext in `ls /usr/local/src/php-${PHP_VERSION}/ext`; \
411421
do echo '*' $( ${PHP_ROOT}/bin/php -r "if(extension_loaded('$ext')){echo '[x] $ext';}else{echo '[ ] $ext';}" ) | sudo tee -a ${PHP_ROOT}/README.md ; done
412422

423+
cat ${PHP_ROOT}/README.md
424+
413425
set -x
414426

415427
if [ "$2" = 'tar' ];then
416428
cd /usr/local
417429

418-
sudo tar -zxvf php${PHP_NUM}.tar.gz php${PHP_NUM}
430+
sudo tar -zcvf php${PHP_NUM}.tar.gz php${PHP_NUM}
419431

420432
cd etc
421433

422-
sudo tar -zxvf php${PHP_NUM}-etc.tar.gz php${PHP_NUM}
434+
sudo tar -zcvf php${PHP_NUM}-etc.tar.gz php${PHP_NUM}
423435

424436
sudo mv /usr/local/php${PHP_NUM}.tar.gz /
425437

0 commit comments

Comments
 (0)