diff options
| author | Galen Guyer <galen@galenguyer.com> | 2022-09-20 17:26:38 -0400 |
|---|---|---|
| committer | Galen Guyer <galen@galenguyer.com> | 2022-09-20 17:26:38 -0400 |
| commit | 63dd7d6deb5a71e2daf2b8f2ed26cfbfab259dac (patch) | |
| tree | ea55e67de763981c582bce959ff26c18710a6a70 /alpine | |
| parent | b272a07e4c1dbdacc04ee54fe80ba9935353d1eb (diff) | |
Add support for multiple platforms and PCRE2
Diffstat (limited to 'alpine')
| -rw-r--r-- | alpine/autoindex/Dockerfile | 12 | ||||
| -rw-r--r-- | alpine/base/Dockerfile | 14 | ||||
| -rw-r--r-- | alpine/spa/Dockerfile | 12 |
3 files changed, 19 insertions, 19 deletions
diff --git a/alpine/autoindex/Dockerfile b/alpine/autoindex/Dockerfile index ac8f582..017c255 100644 --- a/alpine/autoindex/Dockerfile +++ b/alpine/autoindex/Dockerfile @@ -7,15 +7,15 @@ 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 -WORKDIR /src/pcre -ARG PCRE_VER="8.44" -RUN curl -L -O "https://cfhcable.dl.sourceforge.net/project/pcre/pcre/$PCRE_VER/pcre-$PCRE_VER.tar.gz" -RUN tar xzf "/src/pcre/pcre-$PCRE_VER.tar.gz" +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" WORKDIR /src/nginx ARG NGINX_VER RUN curl -L -O "http://nginx.org/download/nginx-$NGINX_VER.tar.gz" -RUN tar xzf "nginx-$NGINX_VER.tar.gz" +RUN tar xzf "/src/nginx/nginx-$NGINX_VER.tar.gz" # configure and build nginx WORKDIR /src/nginx/nginx-"$NGINX_VER" @@ -32,7 +32,7 @@ RUN ./configure --prefix=/usr/share/nginx \ --group=www-data \ --with-threads \ --with-file-aio \ - --with-pcre="/src/pcre/pcre-$PCRE_VER" \ + --with-pcre="/src/pcre2/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 ac8f582..b75c903 100644 --- a/alpine/base/Dockerfile +++ b/alpine/base/Dockerfile @@ -5,17 +5,17 @@ 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/pcre -ARG PCRE_VER="8.44" -RUN curl -L -O "https://cfhcable.dl.sourceforge.net/project/pcre/pcre/$PCRE_VER/pcre-$PCRE_VER.tar.gz" -RUN tar xzf "/src/pcre/pcre-$PCRE_VER.tar.gz" +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" WORKDIR /src/nginx ARG NGINX_VER RUN curl -L -O "http://nginx.org/download/nginx-$NGINX_VER.tar.gz" -RUN tar xzf "nginx-$NGINX_VER.tar.gz" +RUN tar xzf "/src/nginx/nginx-$NGINX_VER.tar.gz" # configure and build nginx WORKDIR /src/nginx/nginx-"$NGINX_VER" @@ -32,7 +32,7 @@ RUN ./configure --prefix=/usr/share/nginx \ --group=www-data \ --with-threads \ --with-file-aio \ - --with-pcre="/src/pcre/pcre-$PCRE_VER" \ + --with-pcre="/src/pcre2/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 ac8f582..017c255 100644 --- a/alpine/spa/Dockerfile +++ b/alpine/spa/Dockerfile @@ -7,15 +7,15 @@ 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 -WORKDIR /src/pcre -ARG PCRE_VER="8.44" -RUN curl -L -O "https://cfhcable.dl.sourceforge.net/project/pcre/pcre/$PCRE_VER/pcre-$PCRE_VER.tar.gz" -RUN tar xzf "/src/pcre/pcre-$PCRE_VER.tar.gz" +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" WORKDIR /src/nginx ARG NGINX_VER RUN curl -L -O "http://nginx.org/download/nginx-$NGINX_VER.tar.gz" -RUN tar xzf "nginx-$NGINX_VER.tar.gz" +RUN tar xzf "/src/nginx/nginx-$NGINX_VER.tar.gz" # configure and build nginx WORKDIR /src/nginx/nginx-"$NGINX_VER" @@ -32,7 +32,7 @@ RUN ./configure --prefix=/usr/share/nginx \ --group=www-data \ --with-threads \ --with-file-aio \ - --with-pcre="/src/pcre/pcre-$PCRE_VER" \ + --with-pcre="/src/pcre2/pcre2-$PCRE2_VER" \ --with-pcre-jit \ --with-http_addition_module \ --without-http_fastcgi_module \ |