Skip to content

Commit d489eab

Browse files
committed
versions upgraded
1 parent 370a9a4 commit d489eab

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

docker/Dockerfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ RUN cabal v1-update && \
3737
curl -L 'https://github.com/lyokha/nginx-healthcheck-plugin/archive/1.2.tar.gz' \
3838
-o nginx-healthcheck-plugin.tar.gz && \
3939
tar xvf nginx-healthcheck-plugin.tar.gz && \
40-
curl -L 'https://github.com/lyokha/nginx-log-plugin/archive/1.2.tar.gz' \
40+
curl -L 'https://github.com/lyokha/nginx-log-plugin/archive/1.3.tar.gz' \
4141
-o nginx-log-plugin.tar.gz && \
4242
tar xvf nginx-log-plugin.tar.gz && \
4343
cd nginx-healthcheck-plugin-1.2 && \
4444
eval "cabal v1-install $cabal_constraints" && \
45-
cd ../nginx-log-plugin-1.2 && \
45+
cd ../nginx-log-plugin-1.3 && \
4646
eval "cabal v1-install $cabal_constraints" && \
4747
cd .. && \
4848
rm -f nginx-healthcheck-plugin.tar.gz nginx-log-plugin.tar.gz && \
@@ -59,7 +59,7 @@ FROM base AS nginx-build
5959
COPY --from=cabal-install /cabal /cabal
6060
COPY --from=cabal-install /root/.ghc /root/.ghc
6161
COPY --from=cabal-install /nginx-healthcheck-plugin-1.2 /nginx-healthcheck-plugin-1.2
62-
COPY --from=cabal-install /nginx-log-plugin-1.2 /nginx-log-plugin-1.2
62+
COPY --from=cabal-install /nginx-log-plugin-1.3 /nginx-log-plugin-1.3
6363

6464
RUN curl -L 'https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz' \
6565
-o echo-nginx-module.tar.gz && \
@@ -70,26 +70,26 @@ RUN curl -L 'https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz
7070
curl -L 'https://github.com/lyokha/nginx-combined-upstreams-module/archive/2.1.tar.gz' \
7171
-o nginx-combined-upstreams-module.tar.gz && \
7272
tar xvf nginx-combined-upstreams-module.tar.gz && \
73-
curl -L 'https://github.com/lyokha/nginx-haskell-module/archive/2.9.6.tar.gz' \
73+
curl -L 'https://github.com/lyokha/nginx-haskell-module/archive/3.1.0.tar.gz' \
7474
-o nginx-haskell-module.tar.gz && \
7575
tar xvf nginx-haskell-module.tar.gz && \
76-
curl -L 'https://nginx.org/download/nginx-1.20.2.tar.gz' \
76+
curl -L 'https://nginx.org/download/nginx-1.22.0.tar.gz' \
7777
-o nginx.tar.gz && \
7878
tar xvf nginx.tar.gz && \
79-
cd nginx-1.20.2 && \
79+
cd nginx-1.22.0 && \
8080
NGX_HTTP_CUSTOM_COUNTERS_PERSISTENCY=yes \
8181
./configure --prefix=/opt/nginx \
8282
--user=nginx --group=nginx \
8383
--with-http_stub_status_module \
8484
--add-module=../echo-nginx-module-0.62 \
8585
--add-module=../nginx-custom-counters-module-4.4 \
8686
--add-module=../nginx-combined-upstreams-module-2.1 \
87-
--add-module=../nginx-haskell-module-2.9.6 \
88-
--add-module=../nginx-haskell-module-2.9.6/aliases \
89-
--add-module=../nginx-haskell-module-2.9.6/examples/dynamicUpstreams/nginx-upconf-module \
87+
--add-module=../nginx-haskell-module-3.1.0 \
88+
--add-module=../nginx-haskell-module-3.1.0/aliases \
89+
--add-module=../nginx-haskell-module-3.1.0/examples/dynamicUpstreams/nginx-upconf-module \
9090
--add-dynamic-module=/nginx-healthcheck-plugin-1.2 \
91-
--add-dynamic-module=/nginx-log-plugin-1.2 \
92-
--add-dynamic-module=/nginx-log-plugin-1.2/module && \
91+
--add-dynamic-module=/nginx-log-plugin-1.3 \
92+
--add-dynamic-module=/nginx-log-plugin-1.3/module && \
9393
make && \
9494
make install && \
9595
cp objs/ngx_healthcheck_plugin.so \
@@ -104,8 +104,8 @@ RUN curl -L 'https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz
104104
nginx-custom-counters-module-4.4 \
105105
nginx-combined-upstreams-module.tar.gz \
106106
nginx-combined-upstreams-module-2.1 \
107-
nginx-haskell-module.tar.gz nginx-haskell-module-2.9.6 \
108-
nginx-healthcheck-plugin-1.2 nginx-log-plugin-1.2 \
107+
nginx-haskell-module.tar.gz nginx-haskell-module-3.1.0 \
108+
nginx-healthcheck-plugin-1.2 nginx-log-plugin-1.3 \
109109
nginx.tar.gz
110110

111111

@@ -117,7 +117,7 @@ COPY data/test_c_plugin.h /build/test_c_plugin.h
117117
COPY data/test_c_plugin.c /build/test_c_plugin.c
118118

119119
RUN cd /build && \
120-
NGX_HOME=/nginx-1.20.2 && \
120+
NGX_HOME=/nginx-1.22.0 && \
121121
gcc -O2 -fPIC -c -o test_c_plugin.o \
122122
-I $NGX_HOME/src/core \
123123
-I $NGX_HOME/src/http \

0 commit comments

Comments
 (0)