Merge pull request #3118 from yenhi/openresty_pcre
Change PCRE mirror of Openresty
This commit is contained in:
commit
37b22ebe01
|
@ -148,7 +148,7 @@ RUN apk add --no-cache --virtual .build-deps \
|
||||||
&& make -j${RESTY_J} \
|
&& make -j${RESTY_J} \
|
||||||
&& make -j${RESTY_J} install_sw \
|
&& make -j${RESTY_J} install_sw \
|
||||||
&& cd /tmp \
|
&& cd /tmp \
|
||||||
&& curl -fSL https://ftp.pcre.org/pub/pcre/pcre-${RESTY_PCRE_VERSION}.tar.gz -o pcre-${RESTY_PCRE_VERSION}.tar.gz \
|
&& curl -fSL https://downloads.sourceforge.net/project/pcre/pcre/${RESTY_PCRE_VERSION}/pcre-${RESTY_PCRE_VERSION}.tar.gz -o pcre-${RESTY_PCRE_VERSION}.tar.gz \
|
||||||
&& tar xzf pcre-${RESTY_PCRE_VERSION}.tar.gz \
|
&& tar xzf pcre-${RESTY_PCRE_VERSION}.tar.gz \
|
||||||
&& cd /tmp/pcre-${RESTY_PCRE_VERSION} \
|
&& cd /tmp/pcre-${RESTY_PCRE_VERSION} \
|
||||||
&& ./configure \
|
&& ./configure \
|
||||||
|
@ -200,7 +200,7 @@ COPY logrotate/nginx /etc/logrotate.d/
|
||||||
|
|
||||||
# Set upstream conf and remove the default conf
|
# Set upstream conf and remove the default conf
|
||||||
RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}; }" > /etc/nginx/conf.d/upstream.conf
|
RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}; }" > /etc/nginx/conf.d/upstream.conf
|
||||||
|
|
||||||
# Copy nginx configuration files
|
# Copy nginx configuration files
|
||||||
COPY nginx.conf /etc/nginx/
|
COPY nginx.conf /etc/nginx/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue