From 6061c3e5228e8c46f53e4216c9372206155a1867 Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Tue, 19 Oct 2021 20:36:16 +0200 Subject: [PATCH 1/2] misp-modules v2.4.150 requires python 3.8 or a downgrade of sigmatools --- modules/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/Dockerfile b/modules/Dockerfile index e8d5e9d..67367f0 100644 --- a/modules/Dockerfile +++ b/modules/Dockerfile @@ -19,7 +19,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ WORKDIR /srv RUN git clone --branch ${MODULES_TAG} --depth 1 https://github.com/MISP/misp-modules.git /srv/misp-modules; \ - cd /srv/misp-modules || exit; sed -i 's/-e //g' REQUIREMENTS; pip3 wheel -r REQUIREMENTS --no-cache-dir -w /wheel/ + cd /srv/misp-modules || exit; \ + sed -i 's/-e //g' -e 's/sigmatools==0.20/sigmatools==0.19.1/' REQUIREMENTS; \ + pip3 wheel -r REQUIREMENTS --no-cache-dir -w /wheel/ RUN git clone --depth 1 https://github.com/stricaud/faup.git /srv/faup; \ cd /srv/faup/build || exit; cmake .. && make install; \ From 7ffb57f74ad2d1cc7e712ab0ff5d4d58dcc1c74e Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Tue, 19 Oct 2021 20:56:24 +0200 Subject: [PATCH 2/2] sigmatools downgrade: Add comment so we remember to upgrade --- modules/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/Dockerfile b/modules/Dockerfile index 67367f0..486fe34 100644 --- a/modules/Dockerfile +++ b/modules/Dockerfile @@ -18,6 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ RUN mkdir /wheel WORKDIR /srv + # TODO: remove downgrade of sigmatools when we have Python 3.8 ref #128 and #143 RUN git clone --branch ${MODULES_TAG} --depth 1 https://github.com/MISP/misp-modules.git /srv/misp-modules; \ cd /srv/misp-modules || exit; \ sed -i 's/-e //g' -e 's/sigmatools==0.20/sigmatools==0.19.1/' REQUIREMENTS; \