From 86104de8bdb4756302e3a7f1f93e21df567735e7 Mon Sep 17 00:00:00 2001
From: Jason Kendall <coolacid@gmail.com>
Date: Thu, 30 Jan 2020 09:45:34 -0500
Subject: [PATCH] .env files don't pass to ARGs, so make it!

---
 docker-compose.yml | 11 +++++++++--
 modules/Dockerfile |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index da6b370..6740403 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,11 @@ services:
 
   misp:
     image: coolacid/docker-misp:core-latest
-    build: server/.
+    build:
+        context: server/.
+        args:
+            - MISP_TAG=${MISP_TAG}
+            - PHP_VER=${PHP_VER}
     depends_on:
       - redis
       - db
@@ -36,7 +40,10 @@ services:
 
   misp-modules:
     image: coolacid/docker-misp:modules-latest
-    build: modules/.
+    build:
+        context: modules/.
+        args:
+            - MISP_TAG=${MISP_TAG}
     environment:
       - "REDIS_BACKEND=redis"
     depends_on:
diff --git a/modules/Dockerfile b/modules/Dockerfile
index 75b13c0..06349b4 100644
--- a/modules/Dockerfile
+++ b/modules/Dockerfile
@@ -1,5 +1,6 @@
 FROM python:3.7-slim-buster  as builder
 ENV DEBIAN_FRONTEND noninteractive
+ARG MISP_TAG
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
                 git \