From d7bc0a7f7ffb3bb6cf0ffee6efc05397667af905 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 14 Dec 2018 11:02:52 -0500
Subject: [PATCH 1/7] Update Dockerfile
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 7740dd3..7f65e54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,7 +112,7 @@ COPY --from=php-build /usr/local/lib/php /usr/local/lib/php/
COPY --from=php-build /usr/local/include/php /usr/local/include/php/
COPY --from=php-build /usr/local/bin /usr/local/bin/
-ARG COMANAGE_REGISTRY_VERSION=3.1.1
+ARG COMANAGE_REGISTRY_VERSION=3.2
ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/${COMANAGE_REGISTRY_VERSION}.tar.gz
ENV COMANAGE_REGISTRY_VERSION ${COMANAGE_REGISTRY_VERSION}
@@ -191,7 +191,7 @@ COPY docker-supervisord-entrypoint /usr/local/bin/
# following line (to prevent other scripts from processing it).
##### ENV TIER_BEACON_OPT_OUT True
-ENV TIER_RELEASE=180801
+ENV TIER_RELEASE=181201
ENV TIER_MAINTAINER=tier
ENTRYPOINT ["docker-supervisord-entrypoint"]
From 0de0eb1f1a8d51fac78393208be2bea50e6426f0 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 14 Dec 2018 11:10:19 -0500
Subject: [PATCH 2/7] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 7f65e54..ac25cb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,7 +112,7 @@ COPY --from=php-build /usr/local/lib/php /usr/local/lib/php/
COPY --from=php-build /usr/local/include/php /usr/local/include/php/
COPY --from=php-build /usr/local/bin /usr/local/bin/
-ARG COMANAGE_REGISTRY_VERSION=3.2
+ARG COMANAGE_REGISTRY_VERSION=develop
ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/${COMANAGE_REGISTRY_VERSION}.tar.gz
ENV COMANAGE_REGISTRY_VERSION ${COMANAGE_REGISTRY_VERSION}
From ab927712f94da4ff428ba4b1983dcd62a186f843 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 20 Dec 2018 15:49:15 -0500
Subject: [PATCH 3/7] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index ac25cb5..a8d9f8f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,7 +112,7 @@ COPY --from=php-build /usr/local/lib/php /usr/local/lib/php/
COPY --from=php-build /usr/local/include/php /usr/local/include/php/
COPY --from=php-build /usr/local/bin /usr/local/bin/
-ARG COMANAGE_REGISTRY_VERSION=develop
+ARG COMANAGE_REGISTRY_VERSION=3.2.0-rc1
ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/${COMANAGE_REGISTRY_VERSION}.tar.gz
ENV COMANAGE_REGISTRY_VERSION ${COMANAGE_REGISTRY_VERSION}
From f009b44a1ee77f37024162ce244a6b8a10cc1ef9 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 20 Dec 2018 15:54:29 -0500
Subject: [PATCH 4/7] Update Jenkinsfile
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 278e7f7..e8652d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
maintainer = "t"
imagename = 'g'
tag = 'l'
- version='3.1.1'
+ version='3.2.0-rc1'
}
stages {
stage('Setting build context') {
@@ -34,7 +34,7 @@ pipeline {
steps {
script {
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
- def baseImg = docker.build("$maintainer/$imagename", "--build-arg COMANAGE_REGISTRY_VERSION=$version .")
+ def baseImg = docker.build("$maintainer/$imagename", "--no-cache --build-arg COMANAGE_REGISTRY_VERSION=$version .")
baseImg.push("$tag")
}
}
From 05b90c9c51cff13fb1444ccf40b535c9255c9369 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 20 Dec 2018 16:09:35 -0500
Subject: [PATCH 5/7] Update common.bash
---
common.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common.bash b/common.bash
index 5b0a486..4e20c57 100644
--- a/common.bash
+++ b/common.bash
@@ -1,3 +1,3 @@
maintainer="tier"
imagename="comanage"
-COMANAGE_REGISTRY_VERSION="3.1.1"
+COMANAGE_REGISTRY_VERSION="3.2.0-rc1"
From 868deaceb28ec52b18afcba9893487b74ba453e6 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 20 Dec 2018 16:14:11 -0500
Subject: [PATCH 6/7] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index a8d9f8f..e209979 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,7 +41,7 @@ RUN yum -y update && yum -y install \
WORKDIR /usr/local/src
-ARG PHP_VERSION=7.2.5
+ARG PHP_VERSION=7.2.12
ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz
RUN mkdir php-src \
From a23919f8829958f8c7ba27f80395ab82c22e25f9 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 7 Jan 2019 09:03:03 -0600
Subject: [PATCH 7/7] bump COmanage and PHP
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index e209979..e9290e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,7 +41,7 @@ RUN yum -y update && yum -y install \
WORKDIR /usr/local/src
-ARG PHP_VERSION=7.2.12
+ARG PHP_VERSION=7.2.13
ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz
RUN mkdir php-src \
@@ -112,7 +112,7 @@ COPY --from=php-build /usr/local/lib/php /usr/local/lib/php/
COPY --from=php-build /usr/local/include/php /usr/local/include/php/
COPY --from=php-build /usr/local/bin /usr/local/bin/
-ARG COMANAGE_REGISTRY_VERSION=3.2.0-rc1
+ARG COMANAGE_REGISTRY_VERSION=3.2.0
ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/${COMANAGE_REGISTRY_VERSION}.tar.gz
ENV COMANAGE_REGISTRY_VERSION ${COMANAGE_REGISTRY_VERSION}