From d231fecd10311250e8b9cd3df0d231f57c74c12b Mon Sep 17 00:00:00 2001
From: Fang Xu <fang.xu@sydney.edu.au>
Date: Mon, 14 Oct 2024 09:00:21 +1100
Subject: [PATCH] Upgrade XNAT to v1.9.0 and standard AIS plugins

---
 .github/workflows/docker-buildx-ci.yml | 15 ++++++++-------
 Dockerfile                             | 18 +++++++++++-------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker-buildx-ci.yml b/.github/workflows/docker-buildx-ci.yml
index ded7a0c..4b3de1f 100644
--- a/.github/workflows/docker-buildx-ci.yml
+++ b/.github/workflows/docker-buildx-ci.yml
@@ -20,11 +20,11 @@ jobs:
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.PACKAGE_NAME }}
@@ -32,23 +32,24 @@ jobs:
             type=semver,priority=900,pattern={{version}}
             type=match,priority=800,pattern=v(.*)
             type=match,priority=800,pattern=\d+.\d+.\d+.\d+
+            type=match,priority=800,pattern=\d+.\d+.\d+
             type=sha
       - 
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - 
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - 
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - 
         name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           # cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.PACKAGE_NAME }}:buildcache
@@ -56,4 +57,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ${{ steps.meta.outputs.tags }}
+            ${{ steps.meta.outputs.tags }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 9d24196..6004449 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,16 @@
-ARG XNAT_VERSION=1.8.10.1
+ARG XNAT_VERSION=1.9.0
 ARG XNAT_ROOT=/data/xnat
 ARG XNAT_HOME=/data/xnat/home
 # default plugins for AIS
-ARG container_service_ver=3.4.3-fat
-ARG ldap_auth_ver=1.1.0
-ARG ohif_viewer_ver=3.6.2
+ARG container_service_ver=3.6.0-fat
+ARG ldap_auth_ver=1.2.0
+ARG ohif_viewer_ver=3.7.0-XNAT-1.8.10
 ARG openid_auth_ver=1.3.1-xpl
-ARG xsync_ver=1.7.0
-ARG batch_launch_ver=0.6.0
+ARG xsync_ver=1.8.0
+ARG batch_launch_ver=0.7.0
+ARG jupyterhub_ver=1.2.0
 
-FROM tomcat:9-jdk8 as build
+FROM tomcat:9-jdk8 AS build
 ARG XNAT_VERSION
 ARG XNAT_ROOT
 ARG XNAT_HOME
@@ -20,6 +21,7 @@ ARG ohif_viewer_ver
 ARG openid_auth_ver
 ARG xsync_ver
 ARG batch_launch_ver
+ARG jupyterhub_ver
 
 RUN <<EOT
   apt-get update
@@ -70,6 +72,8 @@ RUN <<EOT
     https://api.bitbucket.org/2.0/repositories/xnatdev/xsync/downloads/xsync-plugin-all-${xsync_ver}.jar
   wget --no-verbose -P ${XNAT_HOME}/plugins \
     https://api.bitbucket.org/2.0/repositories/xnatx/xnatx-batch-launch-plugin/downloads/batch-launch-${batch_launch_ver}.jar
+  wget --no-verbose -P ${XNAT_HOME}/plugins \
+    https://api.bitbucket.org/2.0/repositories/xnatx/xnat-jupyterhub-plugin/downloads/xnat-jupyterhub-plugin-${jupyterhub_ver}.jar  
 EOT
 
 FROM tomcat:9-jdk8