SchultesDev/nginx-php-fpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu-libiconv moved to community repo fixes build and closes #258

Browse Source
This commit is contained in:
Ric Harvey
2019-03-08 19:35:26 +00:00
parent 97f859fdd8
commit e9027cc44d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -14,7 +14,7 @@ ENV LUAJIT_INC=/usr/include/luajit-2.1
# resolves #166 # resolves #166
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php 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 \ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& CONFIG="\ && CONFIG="\

2
README.md
View File

@@ -10,7 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on
### Versioning ### Versioning
| Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | | 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) For other tags please see: [versioning](https://gitlab.com/ric_harvey/nginx-php-fpm/blob/master/docs/versioning.md)

1
docs/versioning.md
View File

@@ -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 | | 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.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 #### PHP 7.2