From 6a909722e449c167b5df65d378b386082d4591dd Mon Sep 17 00:00:00 2001 From: Ford McDonald Date: Tue, 30 Jan 2024 15:24:21 -0500 Subject: [PATCH 1/4] build(Dockerfile): add container service plugin to xnat container --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ac30928..32ec889 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,8 @@ RUN mkdir -p "${CATALINA_HOME}/webapps/ROOT" \ RUN cd /data/xnat/home/plugins \ && curl -fLO "https://bitbucket.org/xnatx/ldap-auth-plugin/downloads/xnat-ldap-auth-plugin-1.0.0.jar" \ && curl -fLO "https://api.bitbucket.org/2.0/repositories/xnatdev/xsync/downloads/xsync-plugin-all-1.5.0.jar" \ - && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.5.0-XNAT-1.8.7.jar" + && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.5.0-XNAT-1.8.7.jar" \ + && curl -fLO "https://bitbucket.org/xnatdev/container-service/downloads/container-service-3.4.2-fat.jar" COPY docker-entrypoint.sh "/usr/local/bin/docker-entrypoint.sh" From 08bf6e965e02083723a799bb242ac33f795ad385 Mon Sep 17 00:00:00 2001 From: Ford McDonald Date: Thu, 1 Feb 2024 14:03:05 -0500 Subject: [PATCH 2/4] build(Dockerfile): deprecate version of container service plugin --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 32ec889..edfdb38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN cd /data/xnat/home/plugins \ && curl -fLO "https://bitbucket.org/xnatx/ldap-auth-plugin/downloads/xnat-ldap-auth-plugin-1.0.0.jar" \ && curl -fLO "https://api.bitbucket.org/2.0/repositories/xnatdev/xsync/downloads/xsync-plugin-all-1.5.0.jar" \ && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.5.0-XNAT-1.8.7.jar" \ - && curl -fLO "https://bitbucket.org/xnatdev/container-service/downloads/container-service-3.4.2-fat.jar" + && curl -fLO "https://bitbucket.org/xnatdev/container-service/downloads/container-service-3.1.0-fat.jar" COPY docker-entrypoint.sh "/usr/local/bin/docker-entrypoint.sh" From 85e7fb953c20a38ec5838c499e38066b8912aa5b Mon Sep 17 00:00:00 2001 From: Ford McDonald Date: Thu, 1 Feb 2024 14:39:09 -0500 Subject: [PATCH 3/4] build(Dockerfile): changing container service to compatible version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index edfdb38..779b79c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN cd /data/xnat/home/plugins \ && curl -fLO "https://bitbucket.org/xnatx/ldap-auth-plugin/downloads/xnat-ldap-auth-plugin-1.0.0.jar" \ && curl -fLO "https://api.bitbucket.org/2.0/repositories/xnatdev/xsync/downloads/xsync-plugin-all-1.5.0.jar" \ && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.5.0-XNAT-1.8.7.jar" \ - && curl -fLO "https://bitbucket.org/xnatdev/container-service/downloads/container-service-3.1.0-fat.jar" + && curl -fLO "https://bitbucket.org/xnatdev/container-service/downloads/container-service-3.3.0-fat.jar" COPY docker-entrypoint.sh "/usr/local/bin/docker-entrypoint.sh" From 6cd94f12f3fe64d8a58734ca8e0466831d95a0e1 Mon Sep 17 00:00:00 2001 From: Ford McDonald Date: Thu, 9 May 2024 13:19:36 -0400 Subject: [PATCH 4/4] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 713ddd2..5b6a487 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,7 +56,7 @@ RUN mkdir -p "${CATALINA_HOME}/webapps/ROOT" \ # Install LDAP and XSYNC plugins. The versions need to be compatible with the version of XNAT RUN cd /data/xnat/home/plugins \ && curl -fLO "https://bitbucket.org/xnatx/ldap-auth-plugin/downloads/xnat-ldap-auth-plugin-1.0.0.jar" \ - && curl -fLO "https://bitbucket.org/xnatdev/container-service/downloads/container-service-3.3.0-fat.jar" + && curl -fLO "https://bitbucket.org/xnatdev/container-service/downloads/container-service-3.3.0-fat.jar" \ && curl -fLO "https://api.bitbucket.org/2.0/repositories/xnatdev/xsync/downloads/xsync-plugin-all-1.7.0.jar" \ && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.6.2.jar"