diff --git a/Dockerfile b/Dockerfile index e560727..9a6866a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.10-fpm-alpine +FROM php:7.4-fpm-alpine LABEL maintainer="Ric Harvey " @@ -6,16 +6,16 @@ ENV php_conf /usr/local/etc/php-fpm.conf ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf ENV php_vars /usr/local/etc/php/conf.d/docker-vars.ini -ENV NGINX_VERSION 1.18.0 -ENV LUA_MODULE_VERSION 0.10.17 +ENV NGINX_VERSION 1.21.4 +#ENV LUA_MODULE_VERSION 0.10.17 ENV DEVEL_KIT_MODULE_VERSION 0.3.1 ENV GEOIP2_MODULE_VERSION 3.2 -ENV LUAJIT_LIB=/usr/lib -ENV LUAJIT_INC=/usr/include/luajit-2.1 +#ENV LUAJIT_LIB=/usr/lib +#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/community gnu-libiconv +RUN apk add --no-cache gnu-libiconv RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ @@ -64,7 +64,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ --with-file-aio \ --with-http_v2_module \ --add-module=/usr/src/ngx_devel_kit-$DEVEL_KIT_MODULE_VERSION \ - --add-module=/usr/src/lua-nginx-module-$LUA_MODULE_VERSION \ +# --add-module=/usr/src/lua-nginx-module-$LUA_MODULE_VERSION \ # --add-module=/usr/src/ngx_http_geoip2_module-$GEOIP2_MODULE_VERSION \ " \ && addgroup -S nginx \ @@ -89,7 +89,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -o nginx.tar.gz \ && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc -o nginx.tar.gz.asc \ && curl -fSL https://github.com/simpl/ngx_devel_kit/archive/v$DEVEL_KIT_MODULE_VERSION.tar.gz -o ndk.tar.gz \ - && curl -fSL https://github.com/openresty/lua-nginx-module/archive/v$LUA_MODULE_VERSION.tar.gz -o lua.tar.gz \ +# && curl -fSL https://github.com/openresty/lua-nginx-module/archive/v$LUA_MODULE_VERSION.tar.gz -o lua.tar.gz \ # && curl -fSL https://github.com/leev/ngx_http_geoip2_module/archive/$GEOIP2_MODULE_VERSION.tar.gz -o ngx_http_geoip2_module.tar.gz \ && export GNUPGHOME="$(mktemp -d)" \ && found=''; \ @@ -108,7 +108,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && mkdir -p /usr/src \ && tar -zxC /usr/src -f nginx.tar.gz \ && tar -zxC /usr/src -f ndk.tar.gz \ - && tar -zxC /usr/src -f lua.tar.gz \ +# && tar -zxC /usr/src -f lua.tar.gz \ # && tar -zxC /usr/src -f ngx_http_geoip2_module.tar.gz \ # && rm nginx.tar.gz ndk.tar.gz lua.tar.gz ngx_http_geoip2_module.tar.gz \ && cd /usr/src/nginx-$NGINX_VERSION \ @@ -163,8 +163,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stderr /var/log/nginx/error.log -RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ - echo /etc/apk/respositories && \ +RUN echo /etc/apk/respositories && \ apk update && apk upgrade &&\ apk add --no-cache \ bash \ diff --git a/build.sh b/build.sh index 78769df..edb520c 100755 --- a/build.sh +++ b/build.sh @@ -9,5 +9,5 @@ docker buildx create --name phpbuilder docker buildx use phpbuilder echo "Building: PHP Container" -docker buildx build --platform linux/amd64,linux/arm64 -t "richarvey/nginx-php-fpm:${VERSION}" -t richarvey/nginx-php-fpm:latest --push . +docker buildx build --platform linux/amd64,linux/arm64 -t "gschulte/nginx-php-fpm:${VERSION}" -t gschulte/nginx-php-fpm:latest --push . diff --git a/version b/version index 18b3114..1cac385 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.10.4 +1.11.0