Skip to content

Chore add dqr plugin #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fordmcdonald merged 6 commits into from
May 14, 2024
Merged

Chore add dqr plugin #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
16cc915
upgrade ohif volume viewer
fordmcdonald Apr 16, 2024
861e04a
type
fordmcdonald Apr 16, 2024
08da2f7
upgrade xsync
fordmcdonald Apr 16, 2024
e5f04a4
update version
fordmcdonald Apr 30, 2024
963bd03
add DQR plugin
fordmcdonald Apr 30, 2024
aa18ed3
upgrade xnat image version
fordmcdonald May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -56,9 +56,11 @@ 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://bitbucket.org/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.5.3-XNAT-1.8.7.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/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:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
xnat:
build:
context: .
image: ghcr.io/brown-bnc/xnat:1.8.7.1
image: ghcr.io/brown-bnc/xnat:1.8.10.0-dqr
Copy link
Copy Markdown

@hollandjg hollandjg May 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a question – this looks like the image which is going to be built from this version of the repo. Is that right? What's the deploy process?

Copy link
Copy Markdown
Member Author

@fordmcdonald fordmcdonald May 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct—the tag with which I plan to name the image. This hasn't been part of my process in the past, but I figured it would be helpful to update the docker-compose file to reflect the latest image. However, this won't affect the deployment process. Only helpful for someone using docker-compose to build XNAT locally. Our Kubernetes deployment pulls the image straight from the Github Registry, which is built on PRs and via the publish workflow action.

ports:
- "8000:8000"
- "8080:8080"
Expand Down