From c28d4ee1b1f2d1d95774048522c94a18e8794d61 Mon Sep 17 00:00:00 2001
From: Scott Cain <scott+git@scottcain.net>
Date: Mon, 14 Jun 2021 23:25:46 +0000
Subject: [PATCH 1/2] trying git checkout of apollo instead of npm

---
 Dockerfile | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c67d7e543..86f6b38f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,19 +39,22 @@ RUN curl -s "http://hgdownload.soe.ucsc.edu/admin/exe/linux.x86_64/blat/blat" -o
 		gunzip /chado.sql.gz
 
 #NOTE, we had problems with the build the archive-file coming in from github so using a clone instead
+#RUN npm i -g yarn &&  useradd -ms /bin/bash -d /apollo apollo
 RUN npm i -g yarn &&  useradd -ms /bin/bash -d /apollo apollo
-COPY client /apollo/client
-COPY gradlew /apollo
-COPY grails-app /apollo/grails-app
-COPY gwt-sdk /apollo/gwt-sdk
-COPY lib /apollo/lib
-COPY src /apollo/src
-COPY web-app /apollo/web-app
-COPY wrapper /apollo/wrapper
-COPY test /apollo/test
-COPY scripts /apollo/scripts
+RUN git clone --depth 1 --single-branch --branch develop https://github.com/gmod/apollo /apollo/apollo-clone
+RUN mv /apollo/apollo-clone/* /apollo && rm -rf /apollo/apollo-clone
+#COPY client /apollo/client
+#COPY gradlew /apollo
+#COPY grails-app /apollo/grails-app
+#COPY gwt-sdk /apollo/gwt-sdk
+#COPY lib /apollo/lib
+#COPY src /apollo/src
+#COPY web-app /apollo/web-app
+#COPY wrapper /apollo/wrapper
+#COPY test /apollo/test
+#COPY scripts /apollo/scripts
 ADD gra* /apollo/
-COPY apollo /apollo/apollo
+#COPY apollo /apollo/apollo
 ADD build* /apollo/
 ADD settings.gradle /apollo
 ADD application.properties /apollo
@@ -82,10 +85,23 @@ RUN curl -s get.sdkman.io | bash && \
      /bin/bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && yes | sdk install grails 2.5.5" && \
      /bin/bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && yes | sdk install gradle 3.2.1"
 
+RUN which grails
+RUN grails --version
+RUN echo "first"
+
 RUN /bin/bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && /bin/bash /bin/build.sh"
 
+RUN which grails
+RUN grails --version
+RUN echo "second"
 
 USER root
+
+RUN echo "now I'm root"
+RUN which grails
+RUN grails --version
+RUN echo "third"
+
 # remove from webapps and copy it into a staging directory
 #RUN rm -rf ${CATALINA_BASE}/webapps/* && \
 #	cp /apollo/apollo*.war ${CATALINA_BASE}/apollo.war

From 0f2134dcb4bf9a95d8dd0ed0189fd05bea79baed Mon Sep 17 00:00:00 2001
From: Scott Cain <cain@Wouldntketoknow.lan1>
Date: Mon, 14 Jun 2021 17:14:17 -0700
Subject: [PATCH 2/2] minor clean up. the switch to git should address
 https://agr-jira.atlassian.net/browse/AGR-3012

---
 Dockerfile | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 86f6b38f4..206c3ffee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -85,23 +85,10 @@ RUN curl -s get.sdkman.io | bash && \
      /bin/bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && yes | sdk install grails 2.5.5" && \
      /bin/bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && yes | sdk install gradle 3.2.1"
 
-RUN which grails
-RUN grails --version
-RUN echo "first"
-
 RUN /bin/bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && /bin/bash /bin/build.sh"
 
-RUN which grails
-RUN grails --version
-RUN echo "second"
-
 USER root
 
-RUN echo "now I'm root"
-RUN which grails
-RUN grails --version
-RUN echo "third"
-
 # remove from webapps and copy it into a staging directory
 #RUN rm -rf ${CATALINA_BASE}/webapps/* && \
 #	cp /apollo/apollo*.war ${CATALINA_BASE}/apollo.war