From f3b086a911f7fe41fe57f27fe2e2512ecba6682a Mon Sep 17 00:00:00 2001
From: Fritz Ray <fritz.ray@eduworks.com>
Date: Thu, 24 Sep 2020 11:47:41 -0700
Subject: [PATCH] Updated dockerfiles for 1.2

---
 docker/distributed/tomcat-alpine/Dockerfile | 2 +-
 docker/standalone/alpine/Dockerfile         | 3 ++-
 docker/standalone/ubuntu-16.04/Dockerfile   | 2 +-
 docker/standalone/ubuntu-18.04/Dockerfile   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/distributed/tomcat-alpine/Dockerfile b/docker/distributed/tomcat-alpine/Dockerfile
index ff81e74ef..d917c8eef 100644
--- a/docker/distributed/tomcat-alpine/Dockerfile
+++ b/docker/distributed/tomcat-alpine/Dockerfile
@@ -137,7 +137,7 @@ RUN apk add --no-cache git
 
 COPY docker/distributed/tomcat-alpine/server.xml /usr/local/tomcat/conf/server.xml
 
-ARG VERSION=master
+ARG VERSION=1.2
 RUN git clone --recurse-submodules -b $VERSION https://github.com/cassproject/CASS && \
 cd CASS && \
 mvn install && \
diff --git a/docker/standalone/alpine/Dockerfile b/docker/standalone/alpine/Dockerfile
index b489c068c..d5b8f9164 100644
--- a/docker/standalone/alpine/Dockerfile
+++ b/docker/standalone/alpine/Dockerfile
@@ -5,7 +5,8 @@ COPY docker/standalone/alpine/config/server.xml /usr/local/tomcat/conf/server.xm
 
 VOLUME /usr/share/elasticsearch/data
 
-ARG VERSION=master
+ARG VERSION=1.2
+RUN echo $VERSION
 RUN git clone --recurse-submodules -b $VERSION https://github.com/cassproject/CASS && \
 cd CASS && \
 mvn install && \
diff --git a/docker/standalone/ubuntu-16.04/Dockerfile b/docker/standalone/ubuntu-16.04/Dockerfile
index b16244c7e..9ef8e1c3e 100644
--- a/docker/standalone/ubuntu-16.04/Dockerfile
+++ b/docker/standalone/ubuntu-16.04/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 RUN apt-get update;apt-get install -qqy wget curl software-properties-common sudo gawk
 RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
-ARG VERSION=master
+ARG VERSION=1.2
 RUN wget https://raw.githubusercontent.com/cassproject/CASS/master/scripts/cassInstall.sh
 RUN chmod +x cassInstall.sh
 RUN echo $VERSION && /cassInstall.sh $VERSION && rm -rf ~/.m2
diff --git a/docker/standalone/ubuntu-18.04/Dockerfile b/docker/standalone/ubuntu-18.04/Dockerfile
index 9ae8b143c..7a7e23268 100644
--- a/docker/standalone/ubuntu-18.04/Dockerfile
+++ b/docker/standalone/ubuntu-18.04/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 RUN apt-get update;apt-get install -qqy wget curl software-properties-common sudo gawk
 RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
-ARG VERSION=master
+ARG VERSION=1.2
 RUN wget https://raw.githubusercontent.com/cassproject/CASS/master/scripts/cassInstall.sh
 RUN chmod +x cassInstall.sh
 RUN echo $VERSION && /cassInstall.sh $VERSION && rm -rf ~/.m2