From 8a37160fc3f2dde48c95a875d569f5640a9bfc3f Mon Sep 17 00:00:00 2001
From: Jason Kendall <coolacid@gmail.com>
Date: Fri, 21 Feb 2020 10:30:15 -0500
Subject: [PATCH] Move full MISP branch to MISP_TAG arg

---
 .env               | 2 +-
 modules/Dockerfile | 2 +-
 server/Dockerfile  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index 10bda98..e383695 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
-MISP_TAG=2.4.121
+MISP_TAG=v2.4.121
 PHP_VER=20180731
diff --git a/modules/Dockerfile b/modules/Dockerfile
index 06349b4..532babb 100644
--- a/modules/Dockerfile
+++ b/modules/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Build MISP Modules
     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
     WORKDIR /srv/misp-modules
     RUN sed -i 's/-e //g' REQUIREMENTS
diff --git a/server/Dockerfile b/server/Dockerfile
index 893761b..035c764 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,7 +1,7 @@
 FROM composer:1.9 as composer-build
     ARG MISP_TAG
     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
 
 FROM debian:buster-slim as php-build
@@ -95,7 +95,7 @@ ARG PHP_VER
 
 # MISP code
     # 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
         cd /var/www/MISP/app || exit; git submodule update --init --recursive .;