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

Move full MISP branch to MISP_TAG arg

pull/1/head
Jason Kendall 2020-02-21 10:30:15 -05:00
parent 674dd65739
commit 8a37160fc3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

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

2
modules/Dockerfile
View File

@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# Build MISP Modules # Build MISP Modules
WORKDIR /srv WORKDIR /srv
RUN git clone --branch v${MISP_TAG} --depth 1 https://github.com/MISP/misp-modules.git RUN git clone --branch ${MISP_TAG} --depth 1 https://github.com/MISP/misp-modules.git
RUN mkdir /wheel RUN mkdir /wheel
WORKDIR /srv/misp-modules WORKDIR /srv/misp-modules
RUN sed -i 's/-e //g' REQUIREMENTS RUN sed -i 's/-e //g' REQUIREMENTS

4
server/Dockerfile
View File

@ -1,7 +1,7 @@
FROM composer:1.9 as composer-build FROM composer:1.9 as composer-build
ARG MISP_TAG ARG MISP_TAG
WORKDIR /tmp WORKDIR /tmp
ADD https://raw.githubusercontent.com/MISP/MISP/v${MISP_TAG}/app/composer.json /tmp ADD https://raw.githubusercontent.com/MISP/MISP/${MISP_TAG}/app/composer.json /tmp
RUN composer install --ignore-platform-reqs RUN composer install --ignore-platform-reqs
FROM debian:buster-slim as php-build FROM debian:buster-slim as php-build
@ -95,7 +95,7 @@ ARG PHP_VER
# MISP code # MISP code
# Download MISP using git in the /var/www/ directory. # Download MISP using git in the /var/www/ directory.
RUN git clone --branch v${MISP_TAG} --depth 1 https://github.com/MISP/MISP.git /var/www/MISP; \ RUN git clone --branch ${MISP_TAG} --depth 1 https://github.com/MISP/MISP.git /var/www/MISP; \
# We build the MISP modules outside, so we don't need to grab those submodules # We build the MISP modules outside, so we don't need to grab those submodules
cd /var/www/MISP/app || exit; git submodule update --init --recursive .; cd /var/www/MISP/app || exit; git submodule update --init --recursive .;