From 940bcdb64102b3ec5c4f7a722b0530dd177f43e2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 16 Jun 2017 14:47:43 -0400
Subject: [PATCH 01/13] Version bump to 3.1.0 and changed to git

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9f5375d..346a965 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ FROM tier/shibboleth_sp
 ARG registry=docker.io
 ARG maintainer=tier
 ARG imagename=comanage
-ARG version=2.0.0
+ARG version=3.1.0
 ARG tierversion=17040
 
 MAINTAINER $maintainer
@@ -73,7 +73,7 @@ ENV COMANAGE_URL=https://github.com/Internet2/comanage-registry/archive/$VERSION
 ENV COMANAGE_PREFIX=comanage-registry
 
 RUN mkdir -p /tmp/comanage && cd /tmp/comanage && \
-      wget -q $COMANAGE_URL && \
+      git clone -b feature-3.1 https://github.com/Internet2/comanage-registry.git && \
 # Perform verifications [TODO]
 # Prepare filesystem
       mkdir -p /opt/comanage && \

From 18fbd44a0594d552c62b69bb5f1029d91704b27a Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 16 Jun 2017 14:52:42 -0400
Subject: [PATCH 02/13] Install git

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 346a965..86868c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,7 @@ RUN yum -y install --setopt=tsflags=nodocs \
     php-pear-MDB2-Driver-mysqli \
     php-pecl-memcached \
     php-xml \
+    git \
     vim && yum -y clean all
 
 #

From 1088b4abe0e5489d157652aa9c88df6098054e83 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 16 Jun 2017 16:27:20 -0400
Subject: [PATCH 03/13] Update Dockerfile

---
 Dockerfile | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 86868c6..abc0188 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,18 +73,13 @@ ENV MAINTAINER=$maintainer
 ENV COMANAGE_URL=https://github.com/Internet2/comanage-registry/archive/$VERSION.tar.gz
 ENV COMANAGE_PREFIX=comanage-registry
 
-RUN mkdir -p /tmp/comanage && cd /tmp/comanage && \
+RUN mkdir -p /opt/comanage && cd /opt/comanage && \
       git clone -b feature-3.1 https://github.com/Internet2/comanage-registry.git && \
-# Perform verifications [TODO]
-# Prepare filesystem
-      mkdir -p /opt/comanage && \
-      tar xf $VERSION.tar.gz && \
-      mv $COMANAGE_PREFIX-$VERSION /opt/comanage/. && \
-      ln -s /opt/comanage/$VERSION /opt/comanage/current && \
-      mkdir /var/cache/registry && \
+      mv comanage-registry $COMANAGE_PREFIX-$VERSION && \
+      ln -s /opt/comanage/$COMANAGE_PREFIX-$VERSION  /opt/comanage/current && \
       ln -s /var/cache/registry /opt/comanage/$COMANAGE_PREFIX-$VERSION/local/tmp &&  \
-# # Cleanup
-            rm -rf /tmp/comanage
+      chown -R apache /var/cache/registry && \
+      chmod -R 700 /var/cache/registry
 
 ENV COMANAGE_HOME /opt/comanage/current
 

From 8f7bfe86b500a8d974a268a3e32cf3bc30ddda7f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 16 Jun 2017 16:38:21 -0400
Subject: [PATCH 04/13] Update Dockerfile

---
 Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index abc0188..4f588e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -77,9 +77,11 @@ RUN mkdir -p /opt/comanage && cd /opt/comanage && \
       git clone -b feature-3.1 https://github.com/Internet2/comanage-registry.git && \
       mv comanage-registry $COMANAGE_PREFIX-$VERSION && \
       ln -s /opt/comanage/$COMANAGE_PREFIX-$VERSION  /opt/comanage/current && \
-      ln -s /var/cache/registry /opt/comanage/$COMANAGE_PREFIX-$VERSION/local/tmp &&  \
+      mkdir /var/cache/registry && \
+      cp -r /opt/comanage/current/app/tmp.dist /var/cache/registry && \
       chown -R apache /var/cache/registry && \
-      chmod -R 700 /var/cache/registry
+      chmod -R 700 /var/cache/registry && \
+      ln -s /var/cache/registry /opt/comanage/current/local tmp
 
 ENV COMANAGE_HOME /opt/comanage/current
 

From 120787447c47e26319cc7c630009ff2815bfa290 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 16 Jun 2017 16:39:33 -0400
Subject: [PATCH 05/13] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4f588e1..9490f77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,7 +81,7 @@ RUN mkdir -p /opt/comanage && cd /opt/comanage && \
       cp -r /opt/comanage/current/app/tmp.dist /var/cache/registry && \
       chown -R apache /var/cache/registry && \
       chmod -R 700 /var/cache/registry && \
-      ln -s /var/cache/registry /opt/comanage/current/local tmp
+      ln -s /var/cache/registry /opt/comanage/current/local/tmp
 
 ENV COMANAGE_HOME /opt/comanage/current
 

From e6eb248c62b23e0b797aaf31dcb83e6a17d4ae25 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Aug 2017 13:16:06 -0400
Subject: [PATCH 06/13] updating to feature-3.1 branch for sf patch test

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 9490f77..f7f1c73 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,6 +73,7 @@ ENV MAINTAINER=$maintainer
 ENV COMANAGE_URL=https://github.com/Internet2/comanage-registry/archive/$VERSION.tar.gz
 ENV COMANAGE_PREFIX=comanage-registry
 
+# Note using git to grab this alternate feature branch
 RUN mkdir -p /opt/comanage && cd /opt/comanage && \
       git clone -b feature-3.1 https://github.com/Internet2/comanage-registry.git && \
       mv comanage-registry $COMANAGE_PREFIX-$VERSION && \

From e3362a18b1dacd4dc53ed4ee237decd0300855ea Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 25 Sep 2017 08:08:16 -0400
Subject: [PATCH 07/13] changing branch from 3.1-feature to develop

As per BennO post on comanage list.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f7f1c73..6b442d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,7 +75,7 @@ ENV COMANAGE_PREFIX=comanage-registry
 
 # Note using git to grab this alternate feature branch
 RUN mkdir -p /opt/comanage && cd /opt/comanage && \
-      git clone -b feature-3.1 https://github.com/Internet2/comanage-registry.git && \
+      git clone -b develop https://github.com/Internet2/comanage-registry.git && \
       mv comanage-registry $COMANAGE_PREFIX-$VERSION && \
       ln -s /opt/comanage/$COMANAGE_PREFIX-$VERSION  /opt/comanage/current && \
       mkdir /var/cache/registry && \

From f6407820d5e26ebb51f2f19cfbab48b584719240 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 13 Oct 2017 10:34:11 -0400
Subject: [PATCH 08/13] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6b442d8..4dc8462 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,7 +73,7 @@ ENV MAINTAINER=$maintainer
 ENV COMANAGE_URL=https://github.com/Internet2/comanage-registry/archive/$VERSION.tar.gz
 ENV COMANAGE_PREFIX=comanage-registry
 
-# Note using git to grab this alternate feature branch
+# Note using git to grab this alternate develop branch
 RUN mkdir -p /opt/comanage && cd /opt/comanage && \
       git clone -b develop https://github.com/Internet2/comanage-registry.git && \
       mv comanage-registry $COMANAGE_PREFIX-$VERSION && \

From 08ad5c44852e7eb0ca48dd263296f0364d9efcb4 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 15 Feb 2018 14:59:18 -0500
Subject: [PATCH 09/13] Updating to official COmanage 3.1.0 release

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4dc8462..6072803 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ ARG registry=docker.io
 ARG maintainer=tier
 ARG imagename=comanage
 ARG version=3.1.0
-ARG tierversion=17040
+ARG tierversion=18020
 
 MAINTAINER $maintainer
 LABEL Vendor="Internet2"
@@ -75,7 +75,7 @@ ENV COMANAGE_PREFIX=comanage-registry
 
 # Note using git to grab this alternate develop branch
 RUN mkdir -p /opt/comanage && cd /opt/comanage && \
-      git clone -b develop https://github.com/Internet2/comanage-registry.git && \
+      wget -q $COMANAGE_URL && \ && \
       mv comanage-registry $COMANAGE_PREFIX-$VERSION && \
       ln -s /opt/comanage/$COMANAGE_PREFIX-$VERSION  /opt/comanage/current && \
       mkdir /var/cache/registry && \

From dea4e3cf3104fc6fca56c4e66651630f4d20d4f5 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 15 Feb 2018 15:02:23 -0500
Subject: [PATCH 10/13] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6072803..3b7dbfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,7 +75,7 @@ ENV COMANAGE_PREFIX=comanage-registry
 
 # Note using git to grab this alternate develop branch
 RUN mkdir -p /opt/comanage && cd /opt/comanage && \
-      wget -q $COMANAGE_URL && \ && \
+      wget -q $COMANAGE_URL && \
       mv comanage-registry $COMANAGE_PREFIX-$VERSION && \
       ln -s /opt/comanage/$COMANAGE_PREFIX-$VERSION  /opt/comanage/current && \
       mkdir /var/cache/registry && \

From 7acb6fbc661c397ad9aa774d8882db64bc57571b Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 15 Feb 2018 15:13:15 -0500
Subject: [PATCH 11/13] Update Dockerfile

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3b7dbfd..787e3d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,7 +76,6 @@ ENV COMANAGE_PREFIX=comanage-registry
 # Note using git to grab this alternate develop branch
 RUN mkdir -p /opt/comanage && cd /opt/comanage && \
       wget -q $COMANAGE_URL && \
-      mv comanage-registry $COMANAGE_PREFIX-$VERSION && \
       ln -s /opt/comanage/$COMANAGE_PREFIX-$VERSION  /opt/comanage/current && \
       mkdir /var/cache/registry && \
       cp -r /opt/comanage/current/app/tmp.dist /var/cache/registry && \

From 7ff9979265433ad12d260f366b3ceacac5f15801 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 15 Feb 2018 15:15:12 -0500
Subject: [PATCH 12/13] Update Dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 787e3d1..aa00036 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,6 +76,7 @@ ENV COMANAGE_PREFIX=comanage-registry
 # Note using git to grab this alternate develop branch
 RUN mkdir -p /opt/comanage && cd /opt/comanage && \
       wget -q $COMANAGE_URL && \
+      tar xf $VERSION.tar.gz && \
       ln -s /opt/comanage/$COMANAGE_PREFIX-$VERSION  /opt/comanage/current && \
       mkdir /var/cache/registry && \
       cp -r /opt/comanage/current/app/tmp.dist /var/cache/registry && \

From 3d071abafe3bf698f3a30742930c79bcb469f40b Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 4 Apr 2018 11:36:54 -0400
Subject: [PATCH 13/13] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index aa00036..03915c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ ARG registry=docker.io
 ARG maintainer=tier
 ARG imagename=comanage
 ARG version=3.1.0
-ARG tierversion=18020
+ARG tierversion=180401
 
 MAINTAINER $maintainer
 LABEL Vendor="Internet2"