Skip to content

Commit 3e48659

Browse files
author
Ric Harvey
committed
closes #166 fix gnu-libiconv charset
1 parent 520f0ab commit 3e48659

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ ENV DEVEL_KIT_MODULE_VERSION 0.3.0
1212
ENV LUAJIT_LIB=/usr/lib
1313
ENV LUAJIT_INC=/usr/include/luajit-2.0
1414

15+
# resolves #166
16+
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
17+
RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing gnu-libiconv
18+
1519
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
1620
&& CONFIG="\
1721
--prefix=/etc/nginx \
@@ -62,7 +66,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
6266
--add-module=/usr/src/lua-nginx-module-$LUA_MODULE_VERSION \
6367
" \
6468
&& addgroup -S nginx \
65-
&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
69+
&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
6670
&& apk add --no-cache --virtual .build-deps \
6771
autoconf \
6872
gcc \

docs/versioning.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ The latest tag will always follow the master branch in git. the other versions w
3030
| 1.2.5 | 1.2.5 |1.13.4 | 7.1.8 | 3.4 | 0.2.10 |
3131
| 1.2.6 | 1.2.6 |1.13.4 | 7.1.8 | 3.4 | 0.2.11 |
3232
| 1.3.0 | 1.3.0 |1.13.4 | 7.1.8 | 3.4 | 0.3.0 |
33+
| 1.3.1 | 1.3.1 |1.13.4 | 7.1.8 | 3.4 | 0.3.1 |
3334

3435
These tags will be created as releases on GitHub and as tags in docker hub.
3536

0 commit comments

Comments
 (0)