test docker-library/php#240

huiyonghkw · Jul 3, 2017 · f2c2fa7 · f2c2fa7
1 parent 113cf66
commit f2c2fa7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,15 @@
 
 ## 更新日志
 
+### 2017-07-03
+
++ 修复`PHP error:  iconv(): Wrong charset, conversion from `CP936' to `UTF-8' is not allowed on line 1` 问题，参考下面这些内容：
+  + https://github.com/docker-library/php/issues/240
+  + https://gist.github.com/guillemcanal/be3db96d3caa315b4e2b8259cab7d07e 
+  + https://forum.alpinelinux.org/forum/installation/php-iconv-issue
+
++ `bravist/php-cli-alpine-aliyun-app` 基础镜像版本升级至 `1.2`
+
 ### 2017-06-22
 
 + `bravist/php-cli-alpine-aliyun-app` 基础镜像版本升级至 `1.1`，`bravist/php-fpm-alpine-aliyun-app` 基础镜像版本升级至 `1.3`，增加PHP的[`mysqli`](http://php.net/manual/zh/mysqli.overview.php) 扩展支持。

diff --git a/call-websocket/Dockerfile b/call-websocket/Dockerfile
@@ -1,5 +1,5 @@
 #https://yeasy.gitbooks.io/docker_practice/content/image/dockerfile/cmd.html
-FROM bravist/php-cli-alpine-aliyun-app:1.1
+FROM bravist/php-cli-alpine-aliyun-app:1.2
 
 EXPOSE 8190 8191
 

diff --git a/php-crond/Dockerfile b/php-crond/Dockerfile
@@ -1,4 +1,4 @@
-FROM bravist/php-cli-alpine-aliyun-app:1.1
+FROM bravist/php-cli-alpine-aliyun-app:1.2
 
 COPY ./crontabs/default /var/spool/cron/crontabs/
 

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
@@ -1,6 +1,6 @@
 # https://github.com/jorge07/alpine-php
 
-FROM bravist/php-cli-alpine-aliyun-app:1.1
+FROM bravist/php-cli-alpine-aliyun-app:1.2
 
 MAINTAINER bravist <chenghuiyong1987@gmail.com>
 

diff --git a/php-supervisor/Dockerfile b/php-supervisor/Dockerfile
@@ -1,4 +1,4 @@
-FROM bravist/php-cli-alpine-aliyun-app:1.1
+FROM bravist/php-cli-alpine-aliyun-app:1.2
 
 MAINTAINER bravist <chenghuiyong1987@gmail.com>