Merge branch 'master' of github.com:coolacid/docker-misp

pull/1/head
Jason Kendall 2021-10-19 14:59:38 -04:00
commit 77b6673f8a
3 changed files with 18 additions and 2 deletions

12
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1,12 @@
# These are supported funding model platforms
github: [coolacid]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

View File

@ -18,8 +18,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
RUN mkdir /wheel RUN mkdir /wheel
WORKDIR /srv 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; \ 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; \ RUN git clone --depth 1 https://github.com/stricaud/faup.git /srv/faup; \
cd /srv/faup/build || exit; cmake .. && make install; \ cd /srv/faup/build || exit; cmake .. && make install; \

View File

@ -1,4 +1,4 @@
FROM composer:1.9 as composer-build FROM composer:2.1 as composer-build
ARG MISP_TAG ARG MISP_TAG
WORKDIR /tmp WORKDIR /tmp
ADD https://raw.githubusercontent.com/MISP/MISP/${MISP_TAG}/app/composer.json /tmp ADD https://raw.githubusercontent.com/MISP/MISP/${MISP_TAG}/app/composer.json /tmp
@ -33,6 +33,7 @@ FROM debian:buster-slim as python-build
python3-setuptools \ python3-setuptools \
python3-wheel \ python3-wheel \
libfuzzy-dev \ libfuzzy-dev \
libffi-dev \
ca-certificates \ ca-certificates \
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*