diff --git a/Dockerfile b/Dockerfile index 83842db..6bc4fe6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,10 @@ ENV DEVEL_KIT_MODULE_VERSION 0.3.0 ENV LUAJIT_LIB=/usr/lib ENV LUAJIT_INC=/usr/include/luajit-2.0 +# 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 GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ --prefix=/etc/nginx \ @@ -62,7 +66,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ --add-module=/usr/src/lua-nginx-module-$LUA_MODULE_VERSION \ " \ && addgroup -S nginx \ - && adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \ + && adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \ && apk add --no-cache --virtual .build-deps \ autoconf \ gcc \ diff --git a/docs/versioning.md b/docs/versioning.md index 53029d3..6631587 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -30,6 +30,7 @@ The latest tag will always follow the master branch in git. the other versions w | 1.2.5 | 1.2.5 |1.13.4 | 7.1.8 | 3.4 | 0.2.10 | | 1.2.6 | 1.2.6 |1.13.4 | 7.1.8 | 3.4 | 0.2.11 | | 1.3.0 | 1.3.0 |1.13.4 | 7.1.8 | 3.4 | 0.3.0 | +| 1.3.1 | 1.3.1 |1.13.4 | 7.1.8 | 3.4 | 0.3.1 | These tags will be created as releases on GitHub and as tags in docker hub.