Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit 2546570

Browse files
committed
Pointing to working commit and adding it as build-arg
1 parent 6f78c25 commit 2546570

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

e2e/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ EXTRACT_CONTAINER_NAME=modsecurity-wasm-filter-static-extract
55
build-wasm-plugin-static:
66
sed -i 's/envoy-wasm-modsecurity-dynamic/envoy-wasm-modsecurity/' ../wasmplugin/Dockerfile
77
sed -i 's/envoy-wasm-modsecurity-dynamic/envoy-wasm-modsecurity/' ../wasmplugin/Makefile
8-
docker build --platform linux/amd64 -t $(IMAGE_NAME):$(IMAGE_VERSION) -f ../wasmplugin/Dockerfile ../wasmplugin
8+
docker build --platform linux/amd64 -t $(IMAGE_NAME):$(IMAGE_VERSION) -f ../wasmplugin/Dockerfile ../wasmplugin --build-arg MODSEC_SHA=a3454df9b09a8de16d41be10cdea4fc46ef08e91
99
# Go back to old state
1010
cd ../wasmplugin; git checkout .
1111

wasmplugin/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,14 @@ RUN git clone -b v3.9.1 https://github.com/protocolbuffers/protobuf \
2929
&& cd .. \
3030
&& rm -rf protobuf
3131

32+
ARG MODSEC_SHA=a3454df9b09a8de16d41be10cdea4fc46ef08e91
33+
3234
WORKDIR /root/
3335
RUN git clone https://github.com/emscripten-core/emsdk.git -b 3.1.8 \
3436
&& git clone https://github.com/maxfierke/libpcre.git -b mf-wasm32-wasi-cross-compile \
35-
&& git clone https://github.com/SpiderLabs/ModSecurity.git -b v3/dev/wasm-experimental \
37+
&& git clone https://github.com/SpiderLabs/ModSecurity.git \
38+
&& cd ModSecurity \
39+
&& git checkout $MODSEC_SHA \
3640
&& git clone https://github.com/abseil/abseil-cpp -b 20211102.0 \
3741
&& git clone https://github.com/proxy-wasm/proxy-wasm-cpp-sdk \
3842
&& git clone https://github.com/istio/proxy.git -b 1.13.3

0 commit comments

Comments
 (0)