Skip to content

Commit

Permalink
Merge pull request #223 from theseion/cleanup
Browse files Browse the repository at this point in the history
chore: clean up some stuff
  • Loading branch information
fzipi authored Apr 7, 2024
2 parents 425d419 + bc62e99 commit d7bb284
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 35 deletions.
4 changes: 2 additions & 2 deletions apache/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG HTTPD_VERSION="n/a"

FROM httpd:${HTTPD_VERSION} as build
FROM httpd:${HTTPD_VERSION} AS build

ARG MODSEC2_VERSION="n/a"
ARG LUA_VERSION="n/a"
Expand Down Expand Up @@ -36,7 +36,7 @@ RUN set -eux; \
make install; \
make clean

FROM httpd:${HTTPD_VERSION} as crs_release
FROM httpd:${HTTPD_VERSION} AS crs_release

ARG CRS_RELEASE

Expand Down
4 changes: 2 additions & 2 deletions apache/Dockerfile-alpine
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG HTTPD_VERSION="n/a"

FROM httpd:${HTTPD_VERSION}-alpine as build
FROM httpd:${HTTPD_VERSION}-alpine AS build

ARG MODSEC2_VERSION="n/a"
ARG LUA_VERSION="n/a"
Expand Down Expand Up @@ -46,7 +46,7 @@ RUN set -eux; \
make install; \
make clean

FROM httpd:${HTTPD_VERSION}-alpine as crs_release
FROM httpd:${HTTPD_VERSION}-alpine AS crs_release

ARG CRS_RELEASE

Expand Down
4 changes: 2 additions & 2 deletions nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG NGINX_VERSION="n/a"

FROM nginxinc/nginx-unprivileged:${NGINX_VERSION} as build
FROM nginxinc/nginx-unprivileged:${NGINX_VERSION} AS build

ARG MODSEC3_VERSION="n/a"
ARG LMDB_VERSION="n/a"
Expand Down Expand Up @@ -76,7 +76,7 @@ RUN set -eux; \
curl -sSL https://ssl-config.mozilla.org/ffdhe2048.txt -o /usr/share/TLS/dhparam-2048.pem; \
curl -sSL https://ssl-config.mozilla.org/ffdhe4096.txt -o /usr/share/TLS/dhparam-4096.pem

FROM nginxinc/nginx-unprivileged:${NGINX_VERSION} as crs_release
FROM nginxinc/nginx-unprivileged:${NGINX_VERSION} AS crs_release

ARG CRS_RELEASE

Expand Down
4 changes: 2 additions & 2 deletions nginx/Dockerfile-alpine
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG NGINX_VERSION="n/a"

FROM nginxinc/nginx-unprivileged:${NGINX_VERSION}-alpine as build
FROM nginxinc/nginx-unprivileged:${NGINX_VERSION}-alpine AS build

ARG MODSEC3_VERSION="n/a"
ARG LUA_VERSION="n/a"
Expand Down Expand Up @@ -73,7 +73,7 @@ RUN set -eux; \
curl -sSL https://ssl-config.mozilla.org/ffdhe2048.txt -o /usr/share/TLS/dhparam-2048.pem; \
curl -sSL https://ssl-config.mozilla.org/ffdhe4096.txt -o /usr/share/TLS/dhparam-4096.pem

FROM nginxinc/nginx-unprivileged:${NGINX_VERSION}-alpine as crs_release
FROM nginxinc/nginx-unprivileged:${NGINX_VERSION}-alpine AS crs_release

ARG CRS_RELEASE

Expand Down
4 changes: 2 additions & 2 deletions openresty/Dockerfile-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Also specify the nginx core used. (Openresty, adds their own version numbers after the nginx one, so we can't use the same number for both Openresty and nginx)
ARG OPENRESTY_VERSION="n/a"

FROM openresty/openresty:${OPENRESTY_VERSION}-alpine-fat as build
FROM openresty/openresty:${OPENRESTY_VERSION}-alpine-fat AS build

ARG OPENRESTY_VERSION
ARG MODSEC3_VERSION="n/a"
Expand Down Expand Up @@ -91,7 +91,7 @@ RUN /usr/local/openresty/openssl/bin/openssl dhparam -out /usr/share/TLS/dhparam
RUN curl -sSL https://ssl-config.mozilla.org/ffdhe2048.txt -o /usr/share/TLS/dhparam-2048.pem
RUN curl -sSL https://ssl-config.mozilla.org/ffdhe4096.txt -o /usr/share/TLS/dhparam-4096.pem

FROM openresty/openresty:${OPENRESTY_VERSION}-alpine-fat as crs_release
FROM openresty/openresty:${OPENRESTY_VERSION}-alpine-fat AS crs_release

ARG CRS_RELEASE

Expand Down
25 changes: 0 additions & 25 deletions src/release.sh

This file was deleted.

0 comments on commit d7bb284

Please sign in to comment.