From e51d57662f3d4affe7313c7e61f4b8b68f3a5492 Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Fri, 24 Nov 2023 08:56:47 -0800 Subject: [PATCH 1/2] reg:1.0.3 --- reg/Dockerfile | 3 ++- reg/VERSION | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/reg/Dockerfile b/reg/Dockerfile index 649cdc8..2c12064 100644 --- a/reg/Dockerfile +++ b/reg/Dockerfile @@ -1,3 +1,4 @@ -FROM images.opencadc.org/library/cadc-tomcat:1 +#FROM images.opencadc.org/library/cadc-tomcat:1 +FROM cadc-tomcat:latest COPY build/libs/reg.war /usr/share/tomcat/webapps diff --git a/reg/VERSION b/reg/VERSION index 0b51e27..b459d08 100644 --- a/reg/VERSION +++ b/reg/VERSION @@ -1,6 +1,6 @@ ## deployable containers have a semantic and build tag # semantic version tag: major.minor # build version tag: timestamp -VER=1.0.2 +VER=1.0.3 TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")" unset VER From 36a684a24e8d953759edff3a501acc6eaca16aba Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Fri, 24 Nov 2023 08:57:32 -0800 Subject: [PATCH 2/2] revert reg Dockerfile --- reg/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/reg/Dockerfile b/reg/Dockerfile index 2c12064..649cdc8 100644 --- a/reg/Dockerfile +++ b/reg/Dockerfile @@ -1,4 +1,3 @@ -#FROM images.opencadc.org/library/cadc-tomcat:1 -FROM cadc-tomcat:latest +FROM images.opencadc.org/library/cadc-tomcat:1 COPY build/libs/reg.war /usr/share/tomcat/webapps