From 84557cec1b6d8c7ea915ec00802a12e6c3251c3d Mon Sep 17 00:00:00 2001 From: Galen Guyer Date: Wed, 21 Sep 2022 09:55:22 -0400 Subject: Dynamically get PCRE2 version, generate README with tags --- alpine/autoindex/Dockerfile | 10 +++++----- alpine/base/Dockerfile | 8 ++++---- alpine/spa/Dockerfile | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'alpine') diff --git a/alpine/autoindex/Dockerfile b/alpine/autoindex/Dockerfile index 017c255..dd0fe5a 100644 --- a/alpine/autoindex/Dockerfile +++ b/alpine/autoindex/Dockerfile @@ -5,12 +5,12 @@ ARG TARGETVARIANT="" ARG ALPINE_VER="latest" FROM alpine:"$ALPINE_VER" AS builder -RUN apk add gcc g++ git curl make linux-headers tar gzip geoip-dev gd-dev libxslt-dev pcre-dev perl-dev +RUN apk add gcc g++ git curl make linux-headers tar gzip geoip-dev gd-dev libxslt-dev pcre-dev perl-dev WORKDIR /src/pcre2/ -ARG PCRE2_VER="10.40" -RUN curl -L -O "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$PCRE2_VER/pcre2-$PCRE2_VER.tar.gz" -RUN tar xzf "/src/pcre2/pcre2-$PCRE2_VER.tar.gz" +ARG PCRE2_VER="pcre2-10.40" +RUN curl -L -O "https://github.com/PCRE2Project/pcre2/releases/download/$PCRE2_VER/$PCRE2_VER.tar.gz" +RUN tar xzf "/src/pcre2/$PCRE2_VER.tar.gz" WORKDIR /src/nginx ARG NGINX_VER @@ -32,7 +32,7 @@ RUN ./configure --prefix=/usr/share/nginx \ --group=www-data \ --with-threads \ --with-file-aio \ - --with-pcre="/src/pcre2/pcre2-$PCRE2_VER" \ + --with-pcre="/src/pcre2/$PCRE2_VER" \ --with-pcre-jit \ --with-http_addition_module \ --without-http_fastcgi_module \ diff --git a/alpine/base/Dockerfile b/alpine/base/Dockerfile index b75c903..dd0fe5a 100644 --- a/alpine/base/Dockerfile +++ b/alpine/base/Dockerfile @@ -8,9 +8,9 @@ FROM alpine:"$ALPINE_VER" AS builder RUN apk add gcc g++ git curl make linux-headers tar gzip geoip-dev gd-dev libxslt-dev pcre-dev perl-dev WORKDIR /src/pcre2/ -ARG PCRE2_VER="10.40" -RUN curl -L -O "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$PCRE2_VER/pcre2-$PCRE2_VER.tar.gz" -RUN tar xzf "/src/pcre2/pcre2-$PCRE2_VER.tar.gz" +ARG PCRE2_VER="pcre2-10.40" +RUN curl -L -O "https://github.com/PCRE2Project/pcre2/releases/download/$PCRE2_VER/$PCRE2_VER.tar.gz" +RUN tar xzf "/src/pcre2/$PCRE2_VER.tar.gz" WORKDIR /src/nginx ARG NGINX_VER @@ -32,7 +32,7 @@ RUN ./configure --prefix=/usr/share/nginx \ --group=www-data \ --with-threads \ --with-file-aio \ - --with-pcre="/src/pcre2/pcre2-$PCRE2_VER" \ + --with-pcre="/src/pcre2/$PCRE2_VER" \ --with-pcre-jit \ --with-http_addition_module \ --without-http_fastcgi_module \ diff --git a/alpine/spa/Dockerfile b/alpine/spa/Dockerfile index 017c255..dd0fe5a 100644 --- a/alpine/spa/Dockerfile +++ b/alpine/spa/Dockerfile @@ -5,12 +5,12 @@ ARG TARGETVARIANT="" ARG ALPINE_VER="latest" FROM alpine:"$ALPINE_VER" AS builder -RUN apk add gcc g++ git curl make linux-headers tar gzip geoip-dev gd-dev libxslt-dev pcre-dev perl-dev +RUN apk add gcc g++ git curl make linux-headers tar gzip geoip-dev gd-dev libxslt-dev pcre-dev perl-dev WORKDIR /src/pcre2/ -ARG PCRE2_VER="10.40" -RUN curl -L -O "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$PCRE2_VER/pcre2-$PCRE2_VER.tar.gz" -RUN tar xzf "/src/pcre2/pcre2-$PCRE2_VER.tar.gz" +ARG PCRE2_VER="pcre2-10.40" +RUN curl -L -O "https://github.com/PCRE2Project/pcre2/releases/download/$PCRE2_VER/$PCRE2_VER.tar.gz" +RUN tar xzf "/src/pcre2/$PCRE2_VER.tar.gz" WORKDIR /src/nginx ARG NGINX_VER @@ -32,7 +32,7 @@ RUN ./configure --prefix=/usr/share/nginx \ --group=www-data \ --with-threads \ --with-file-aio \ - --with-pcre="/src/pcre2/pcre2-$PCRE2_VER" \ + --with-pcre="/src/pcre2/$PCRE2_VER" \ --with-pcre-jit \ --with-http_addition_module \ --without-http_fastcgi_module \ -- cgit v1.2.3