From 93787a49b61946c5bc78f6a1dcd5a541387fd6d2 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Thu, 21 Mar 2024 14:20:27 +0000
Subject: [PATCH 1/3] remove obsolete variable

---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 75833203..5fbb6a93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
     jenkins:

From 4ce43f399f12855ee9eafd64b5efeaa9301fa98a Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Thu, 21 Mar 2024 21:52:25 +0000
Subject: [PATCH 2/3] add variable for in-place import

---
 .env               | 3 +++
 docker-compose.yml | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/.env b/.env
index 6e558d41..5dfdda42 100644
--- a/.env
+++ b/.env
@@ -23,6 +23,9 @@ POSTGRES_PORT=
 REPO_CURATED=/tmp/curated
 REPO_CONFIG=/tmp/config
 
+# Variables for importing data in place.
+REPO_IMPORT=/tmp/import
+
 # Variables for controlling external dependencies versions
 POSTGRES_VERSION=16
 NGINX_VERSION=1.24
diff --git a/docker-compose.yml b/docker-compose.yml
index 5fbb6a93..e777165c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,7 @@ services:
         volumes:
             - ./slave:/home/omero
             - ${REPO_CONFIG}:${REPO_CONFIG}
+            - ${REPO_IMPORT}:${REPO_IMPORT}:ro
         environment:
             - SLAVE_NAME=testintegration
             - SLAVE_EXECUTORS=2
@@ -55,6 +56,7 @@ services:
             - omero-network
         volumes:
             - ./server:/home/omero
+            - ${REPO_IMPORT}:${REPO_IMPORT}:ro
         environment:
             - SLAVE_NAME=omero
             - SLAVE_EXECUTORS=2

From a408ccfadfe36169eda8d41b30e5e351839c94b0 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Fri, 22 Mar 2024 11:07:46 +0000
Subject: [PATCH 3/3] install figure script from build

---
 home/jobs/OMERO-server/config.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/home/jobs/OMERO-server/config.xml b/home/jobs/OMERO-server/config.xml
index 179ccfe8..ba2a604f 100644
--- a/home/jobs/OMERO-server/config.xml
+++ b/home/jobs/OMERO-server/config.xml
@@ -141,6 +141,10 @@ for x in *.tar.gz; do
     pip install -U $x # Install marshal, etc. *after* requirements
 done
 
+# Install figure script
+wget https://raw.githubusercontent.com/$SPACE_USER/omero-figure/$MERGE_PUSH_BRANCH/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+chmod 755 Figure_To_Pdf.py
+mv Figure_To_Pdf.py $OMERO_DIST/lib/scripts/omero/figure_scripts
 
 omero config set omero.db.name $OMERO_DB_NAME
 omero config set omero.db.host $OMERO_DB_HOST