From e9027cc44d9483a3907efd9ba6e52be5b4f18a51 Mon Sep 17 00:00:00 2001 From: Ric Harvey Date: Fri, 8 Mar 2019 19:35:26 +0000 Subject: [PATCH] gnu-libiconv moved to community repo fixes build and closes #258 --- Dockerfile | 2 +- README.md | 2 +- docs/versioning.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 83392c8..b815eab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ENV LUAJIT_INC=/usr/include/luajit-2.1 # resolves #166 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php -RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing gnu-libiconv +RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community gnu-libiconv RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ diff --git a/README.md b/README.md index e95b9e9..791dba5 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on ### Versioning | Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | |-----|-------|-----|--------|--------| -| latest/1.6.0 | Master Branch |1.14.2 | 7.3.2 | 3.9 | +| latest/1.6.1 | Master Branch |1.14.2 | 7.3.2 | 3.9 | For other tags please see: [versioning](https://gitlab.com/ric_harvey/nginx-php-fpm/blob/master/docs/versioning.md) diff --git a/docs/versioning.md b/docs/versioning.md index 021cd56..38a2545 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -18,6 +18,7 @@ The latest tag will always follow the master branch in git. the other versions w | Docker Tag | PHP Version | Nginx Version | Alpine Version | Container Scripts | |-----|-------|-----|--------|--------| | 1.6.0 | 7.3.2 |1.14.2 | 3.9 | 0.3.8 | +| 1.6.1 | 7.3.2 |1.14.2 | 3.9 | 0.3.8 | #### PHP 7.2