From 16cc915ccde9e9a99435ca416b9e32e10403dcc7 Mon Sep 17 00:00:00 2001 From: Ford McDonald Date: Tue, 16 Apr 2024 12:02:27 -0400 Subject: [PATCH 1/6] upgrade ohif volume viewer --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f58cb3..6e67a29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM openjdk:8-jdk-slim as build # CAUTION: XNAT VERSION for this stage, make sure to also update next stage!! -ENV XNAT_VERSION=1.8.7.1 +ENV XNAT_VERSION=1.8.10 ENV JAVA_OPTS="-Xmx2560m -XX:+HeapDumpOnOutOfMemoryError" RUN apt-get update && apt-get install -y \ @@ -23,7 +23,7 @@ RUN ./gradlew --no-daemon clean war #----------------------------------------------------------------------------- FROM tomcat:9-jdk8-openjdk-slim -ENV XNAT_VERSION=1.8.7.1 +ENV XNAT_VERSION=1.8.10 RUN apt-get update && apt-get install -y \ curl \ @@ -57,7 +57,7 @@ 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.3-XNAT-1.8.7.jar" + && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.6.2.jar.jar" COPY docker-entrypoint.sh "/usr/local/bin/docker-entrypoint.sh" From 861e04a9bb78393335e61d1d78071e3702509ad2 Mon Sep 17 00:00:00 2001 From: Ford McDonald Date: Tue, 16 Apr 2024 12:16:18 -0400 Subject: [PATCH 2/6] type --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6e67a29..d498ec0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,7 @@ 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.6.2.jar.jar" + && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.6.2.jar" COPY docker-entrypoint.sh "/usr/local/bin/docker-entrypoint.sh" From 08da2f759c7e8346ce8bb646239472191b2e3b45 Mon Sep 17 00:00:00 2001 From: Ford McDonald Date: Tue, 16 Apr 2024 12:20:32 -0400 Subject: [PATCH 3/6] upgrade xsync --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d498ec0..046370f 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://api.bitbucket.org/2.0/repositories/xnatdev/xsync/downloads/xsync-plugin-all-1.5.0.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" COPY docker-entrypoint.sh "/usr/local/bin/docker-entrypoint.sh" From e5f04a4d1464dead2baa7c1aa9be82ec7bbdb719 Mon Sep 17 00:00:00 2001 From: Ford McDonald Date: Tue, 30 Apr 2024 18:18:51 -0400 Subject: [PATCH 4/6] update version --- Dockerfile | 2 +- docker-compose.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 046370f..b5b105f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,7 @@ 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.7.0.jar" \ - && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.6.2.jar" + && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.6.2.jar" COPY docker-entrypoint.sh "/usr/local/bin/docker-entrypoint.sh" diff --git a/docker-compose.yaml b/docker-compose.yaml index 4b6dadb..a2f4324 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ services: xnat: build: context: . - image: ghcr.io/brown-bnc/xnat:1.8.7.1 + image: xnat ports: - "8000:8000" - "8080:8080" @@ -17,8 +17,8 @@ services: XNAT_SITE_URL: "http://xnat.local" XNAT_ADMIN_EMAIL: "admin@xnat.local" # NOTE (BNR): Uncomment the following lines to enable LDAP -# volumes: -# - "${PWD}/ldap-provider.properties:/data/xnat/home/config/auth/ldap-provider.properties" + # volumes: + # - "${PWD}/brownldap-provider.properties:/data/xnat/home/config/auth/brownldap-provider.properties" postgres: image: postgres:10 environment: From 963bd030ae1f77e6cbaa154f1da51156ee739864 Mon Sep 17 00:00:00 2001 From: Ford McDonald Date: Tue, 30 Apr 2024 18:20:43 -0400 Subject: [PATCH 5/6] add DQR plugin --- Dockerfile | 4 +++- docker-compose.yaml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b5b105f..f6edb2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,8 +57,10 @@ 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.7.0.jar" \ - && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.6.2.jar" + && curl -fLO "https://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.6.2.jar" \ + && curl -fLO "https://bitbucket.org/xnatdev/dicom-query-retrieve/downloads/dicom-query-retrieve-2.0.1-xpl.jar" + COPY docker-entrypoint.sh "/usr/local/bin/docker-entrypoint.sh" # NOTE (BNR): Ports have the following use: diff --git a/docker-compose.yaml b/docker-compose.yaml index a2f4324..b782b69 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -17,8 +17,8 @@ services: XNAT_SITE_URL: "http://xnat.local" XNAT_ADMIN_EMAIL: "admin@xnat.local" # NOTE (BNR): Uncomment the following lines to enable LDAP - # volumes: - # - "${PWD}/brownldap-provider.properties:/data/xnat/home/config/auth/brownldap-provider.properties" + volumes: + - "${PWD}/brownldap-provider.properties:/data/xnat/home/config/auth/brownldap-provider.properties" postgres: image: postgres:10 environment: From aa18ed34a24f1371a492a1c288f1784f658b73c3 Mon Sep 17 00:00:00 2001 From: Ford McDonald Date: Thu, 9 May 2024 15:20:59 -0400 Subject: [PATCH 6/6] upgrade xnat image version --- docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index b782b69..a972a9e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ services: xnat: build: context: . - image: xnat + image: ghcr.io/brown-bnc/xnat:1.8.10.0-dqr ports: - "8000:8000" - "8080:8080" @@ -17,8 +17,8 @@ services: XNAT_SITE_URL: "http://xnat.local" XNAT_ADMIN_EMAIL: "admin@xnat.local" # NOTE (BNR): Uncomment the following lines to enable LDAP - volumes: - - "${PWD}/brownldap-provider.properties:/data/xnat/home/config/auth/brownldap-provider.properties" +# volumes: +# - "${PWD}/ldap-provider.properties:/data/xnat/home/config/auth/ldap-provider.properties" postgres: image: postgres:10 environment: