Skip to content

Commit 93a0844

Browse files
committed
Set autossl rock version
It fixes issues with unexpected incompatible changes (like letsencrypt to dehydrated rename)
1 parent f53f3d8 commit 93a0844

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

Dockerfile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ FROM metabrainz/consul-template-base
22

33
MAINTAINER Laurent Monin <zas@metabrainz.org>
44

5-
# Docker Build Arguments
5+
# Openresty & libs versions
66
ARG RESTY_VERSION="1.11.2.1"
77
ARG RESTY_OPENSSL_VERSION="1.0.2j"
88
ARG RESTY_PCRE_VERSION="8.39"
9+
10+
# luarocks & rocks versions
911
ARG RESTY_LUAROCKS_VERSION="2.4.0"
12+
ARG RESTY_AUTOSSL_VERSION="0.10.0-1"
13+
14+
# build setup
1015
ARG RESTY_J="1"
1116
ARG RESTY_BUILDIR="/tmp/build"
1217
ARG RESTY_CONFIG_OPTIONS="\
@@ -65,10 +70,6 @@ RUN cd ${RESTY_BUILDIR} \
6570
&& curl -fkSL https://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${RESTY_PCRE_VERSION}.tar.gz -o pcre-${RESTY_PCRE_VERSION}.tar.gz \
6671
&& tar xzf pcre-${RESTY_PCRE_VERSION}.tar.gz
6772

68-
RUN cd ${RESTY_BUILDIR} \
69-
&& curl -fkSL http://luarocks.org/releases/luarocks-${RESTY_LUAROCKS_VERSION}.tar.gz -o luarocks-${RESTY_LUAROCKS_VERSION}.tar.gz \
70-
&& tar xzf luarocks-${RESTY_LUAROCKS_VERSION}.tar.gz
71-
7273
RUN cd ${RESTY_BUILDIR} \
7374
&& curl -fkSL https://openresty.org/download/openresty-${RESTY_VERSION}.tar.gz -o openresty-${RESTY_VERSION}.tar.gz \
7475
&& tar xzf openresty-${RESTY_VERSION}.tar.gz
@@ -80,6 +81,10 @@ RUN cd ${RESTY_BUILDIR}/openresty-${RESTY_VERSION} \
8081

8182
RUN mkdir -p /var/cache/nginx/ && chown nginx:nginx /var/cache/nginx/
8283

84+
RUN cd ${RESTY_BUILDIR} \
85+
&& curl -fkSL http://luarocks.org/releases/luarocks-${RESTY_LUAROCKS_VERSION}.tar.gz -o luarocks-${RESTY_LUAROCKS_VERSION}.tar.gz \
86+
&& tar xzf luarocks-${RESTY_LUAROCKS_VERSION}.tar.gz
87+
8388
RUN cd ${RESTY_BUILDIR}/luarocks-${RESTY_LUAROCKS_VERSION} \
8489
&& ./configure \
8590
--prefix=/usr/local/openresty/luajit \
@@ -94,7 +99,7 @@ RUN cd ${RESTY_BUILDIR}/luarocks-${RESTY_LUAROCKS_VERSION} \
9499

95100
RUN mkdir -p /etc/resty-auto-ssl && chown nginx:nginx /etc/resty-auto-ssl
96101

97-
RUN luarocks install lua-resty-auto-ssl
102+
RUN luarocks install lua-resty-auto-ssl ${RESTY_AUTOSSL_VERSION}
98103

99104
RUN openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj '/CN=sni-support-required-for-valid-ssl' -keyout /etc/ssl/resty-auto-ssl-fallback.key -out /etc/ssl/resty-auto-ssl-fallback.crt
100105

0 commit comments

Comments
 (0)