Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use new upstream sources #230

Merged
merged 1 commit into from
Apr 22, 2024
Merged

fix: use new upstream sources #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN set -eux; \
strip /usr/local/lib/liblmdb*.so*

RUN set -eux; \
git clone https://github.com/SpiderLabs/ModSecurity --branch "v${MODSEC3_VERSION}" --depth 1 --recursive; \
git clone https://github.com/owasp-modsecurity/ModSecurity --branch "v${MODSEC3_VERSION}" --depth 1 --recursive; \
cd ModSecurity; \
ARCH=$(gcc -print-multiarch); \
sed -ie "s/i386-linux-gnu/${ARCH}/g" build/ssdeep.m4; \
Expand All @@ -56,7 +56,7 @@ RUN set -eux; \

# We use master
RUN set -eux; \
git clone -b master --depth 1 https://github.com/SpiderLabs/ModSecurity-nginx.git; \
git clone -b master --depth 1 https://github.com/owasp-modsecurity/ModSecurity-nginx.git; \
curl -sSL https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz -o nginx-${NGINX_VERSION}.tar.gz; \
tar -xzf nginx-${NGINX_VERSION}.tar.gz; \
cd ./nginx-${NGINX_VERSION}; \
Expand Down
4 changes: 2 additions & 2 deletions nginx/Dockerfile-alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN set -eux; \
WORKDIR /sources

RUN set -eux; \
git clone https://github.com/SpiderLabs/ModSecurity --branch "v${MODSEC3_VERSION}" --depth 1 --recursive; \
git clone https://github.com/owasp-modsecurity/ModSecurity --branch "v${MODSEC3_VERSION}" --depth 1 --recursive; \
cd ModSecurity; \
ARCH=$(gcc -print-multiarch); \
sed -ie "s/i386-linux-gnu/${ARCH}/g" build/ssdeep.m4; \
Expand All @@ -54,7 +54,7 @@ RUN set -eux; \

# We use master
RUN set -eux; \
git clone -b master --depth 1 https://github.com/SpiderLabs/ModSecurity-nginx.git; \
git clone -b master --depth 1 https://github.com/owasp-modsecurity/ModSecurity-nginx.git; \
wget --quiet http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz; \
tar -xzf nginx-${NGINX_VERSION}.tar.gz; \
cd ./nginx-${NGINX_VERSION}; \
Expand Down
4 changes: 2 additions & 2 deletions openresty/Dockerfile-alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ WORKDIR /sources

# Download ModSecurity and compile it.
RUN set -eux; \
git clone https://github.com/SpiderLabs/ModSecurity --branch "v${MODSEC3_VERSION}" --depth 1 --recursive; \
git clone https://github.com/owasp-modsecurity/ModSecurity --branch "v${MODSEC3_VERSION}" --depth 1 --recursive; \
cd ModSecurity; \
ARCH=$(gcc -print-multiarch); \
sed -ie "s/i386-linux-gnu/${ARCH}/g" build/ssdeep.m4; \
Expand All @@ -61,7 +61,7 @@ RUN set -eux; \
# Download Openresty bundle for the specific version. We can then get the compilation options for nginx from the installed Openresty in the docker image to be used with the 'configure' script inside the openresty bundle to configure the ModSecurity-nginx module and then build it. I did not find the configure script inside the Openresty Docker image.
# Specify the LUAJIT_LIB and LUAJIT_INC that are already installed in the base image.
RUN set -eux; \
git clone -b master --depth 1 https://github.com/SpiderLabs/ModSecurity-nginx.git; \
git clone -b master --depth 1 https://github.com/owasp-modsecurity/ModSecurity-nginx.git; \
wget --quiet https://openresty.org/download/openresty-"${OPENRESTY_VERSION}".tar.gz; \
tar -xzf openresty-"${OPENRESTY_VERSION}".tar.gz; \
cd ./openresty-"${OPENRESTY_VERSION}"/bundle/nginx-${NGINX_VERSION}; \
Expand Down