MISP
/
misp-docker
mirror of https://github.com/MISP/misp-docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Split Core and Modules version args - fixes #36

pull/1/head
Jason Kendall 2020-02-27 16:15:22 -05:00
parent c57f2669ec
commit 458ddd125d
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@ -1,2 +1,3 @@
MISP_TAG=v2.4.121 MISP_TAG=v2.4.121
MODULES_TAG=v2.4.121
PHP_VER=20180731 PHP_VER=20180731

2
docker-compose.yml
View File

@ -49,7 +49,7 @@ services:
build: build:
context: modules/. context: modules/.
args: args:
- MISP_TAG=${MISP_TAG} - MODULES_TAG=${MODULES_TAG}
environment: environment:
- "REDIS_BACKEND=redis" - "REDIS_BACKEND=redis"
depends_on: depends_on:

4
modules/Dockerfile
View File

@ -1,6 +1,6 @@
FROM python:3.7-slim-buster as builder FROM python:3.7-slim-buster as builder
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ARG MISP_TAG ARG MODULES_TAG
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
cmake \ cmake \
@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
RUN mkdir /wheel RUN mkdir /wheel
WORKDIR /srv WORKDIR /srv
RUN git clone --branch ${MISP_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' 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; \

2
modules/hooks/build
View File

@ -9,7 +9,7 @@ export $(grep -v '^#' ../.env | xargs)
docker pull $DOCKER_REPO:modules-latest docker pull $DOCKER_REPO:modules-latest
docker build \ docker build \
--build-arg MISP_TAG=$MISP_TAG \ --build-arg MODULES_TAG=$MODULES_TAG \
--build-arg PHP_VER=$PHP_VER \ --build-arg PHP_VER=$PHP_VER \
--build-arg BUILD_RFC3339=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --build-arg BUILD_RFC3339=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--build-arg COMMIT=$(git rev-parse --short HEAD) \ --build-arg COMMIT=$(git rev-parse --short HEAD) \