From 3f034c385d9d7a2aeed95ed85339713d7b55984c Mon Sep 17 00:00:00 2001
From: Rob Court <rcourt@ed.ac.uk>
Date: Fri, 25 Oct 2024 14:33:36 +0100
Subject: [PATCH 1/4] typo fix

---
 components/interface/VFBFocusTerm/VFBFocusTerm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/interface/VFBFocusTerm/VFBFocusTerm.js b/components/interface/VFBFocusTerm/VFBFocusTerm.js
index 12d6e78d8..ab44305f4 100644
--- a/components/interface/VFBFocusTerm/VFBFocusTerm.js
+++ b/components/interface/VFBFocusTerm/VFBFocusTerm.js
@@ -571,7 +571,7 @@ class VFBFocusTerm extends React.Component {
                   : <i className="fa fa-chevron-right arrowsStyle isDisabled" /> 
                 }
                 <Tooltip placement="top-end"
-                  title="NBLAS Uploader">
+                  title="NBLAST Uploader">
                   <i id="fa-upload" className="fa fa-upload arrowsStyle"
                     onClick={() => {
                       this.props.UIUpdateManager("uploaderContentsVisible");

From 3407eed65bf7a0e9f1bbb31f854ab1f5b6baaef6 Mon Sep 17 00:00:00 2001
From: Rob Court <rcourt@ed.ac.uk>
Date: Tue, 21 Jan 2025 13:39:23 +0000
Subject: [PATCH 2/4] runs-on: ubuntu-22.04

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf033766a..c1ca70a3f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
   # Deploy the local and remote versions of geppetto-vfb
   deploy-test:
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     # total job timeout:
     timeout-minutes: 590
 

From 9413b2f86b86d590d374faa960f66c70df265aa9 Mon Sep 17 00:00:00 2001
From: Rob Court <rcourt@ed.ac.uk>
Date: Tue, 21 Jan 2025 14:02:40 +0000
Subject: [PATCH 3/4] Client to v2.2.7

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5e9c13c3b..c2fb40f8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ ARG geppettoSimulationRelease=VFBv2.1.0.2
 ARG geppettoDatasourceRelease=passingSOLR
 ARG geppettoModelSwcRelease=v1.0.1
 ARG geppettoFrontendRelease=VFBv2.1.0.3
-ARG geppettoClientRelease=VFBv2.2.5
+ARG geppettoClientRelease=VFBv2.2.7
 ARG ukAcVfbGeppettoRelease=v2.2.4.4
 
 ARG mvnOpt="-Dhttps.protocols=TLSv1.2 -DskipTests --quiet -Pmaster"

From 061921eb18c75c0db34b8b5772655cacee30047e Mon Sep 17 00:00:00 2001
From: Rob Court <rcourt@ed.ac.uk>
Date: Tue, 21 Jan 2025 15:49:38 +0000
Subject: [PATCH 4/4] Datasource VFBv2.2.0

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c2fb40f8e..74a13a228 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ARG geppettoRelease=vfb_20200604_a
 ARG geppettoModelRelease=vfb_20200604_a
 ARG geppettoCoreRelease=VFBv2.2.0
 ARG geppettoSimulationRelease=VFBv2.1.0.2
-ARG geppettoDatasourceRelease=passingSOLR
+ARG geppettoDatasourceRelease=VFBv2.2.0
 ARG geppettoModelSwcRelease=v1.0.1
 ARG geppettoFrontendRelease=VFBv2.1.0.3
 ARG geppettoClientRelease=VFBv2.2.7