From f2c2fa7662511bb7a969a08222908d0a2b65fa06 Mon Sep 17 00:00:00 2001 From: bravist Date: Mon, 3 Jul 2017 11:11:46 +0800 Subject: [PATCH] test https://github.com/docker-library/php/issues/240 --- README.md | 9 +++++++++ call-websocket/Dockerfile | 2 +- php-crond/Dockerfile | 2 +- php-fpm/Dockerfile | 2 +- php-supervisor/Dockerfile | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e22fc14..a820afc 100644 --- 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 index 0207c89..6b5d9cd 100644 --- 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 index da54961..0051167 100644 --- 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 index 46c62f3..51e9da3 100644 --- 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 diff --git a/php-supervisor/Dockerfile b/php-supervisor/Dockerfile index ecdc60a..9e75f9f 100644 --- 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