Split Core and Modules version args - fixes #36

.env

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

docker-compose.yml

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

modules/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.7-slim-buster  as builder
 ENV DEBIAN_FRONTEND noninteractive
-ARG MISP_TAG
+ARG MODULES_TAG
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
                 cmake \
@@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     RUN mkdir /wheel
     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/
 
     RUN git clone --depth 1 https://github.com/stricaud/faup.git /srv/faup; \

modules/hooks/build

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