From 88d7301171c90145f1a8266d2cff0f41246b9333 Mon Sep 17 00:00:00 2001
From: georgweiss <georg.weiss@ess.eu>
Date: Tue, 3 Mar 2026 16:18:54 +0100
Subject: [PATCH 1/3] Dockerfile for scan server, also exclusion of unneeded
 dependencies from core

---
 services/scan-server/Dockerfile |  6 ++++++
 services/scan-server/pom.xml    | 35 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 services/scan-server/Dockerfile

diff --git a/services/scan-server/Dockerfile b/services/scan-server/Dockerfile
new file mode 100644
index 0000000000..99def0673a
--- /dev/null
+++ b/services/scan-server/Dockerfile
@@ -0,0 +1,6 @@
+FROM eclipse-temurin:17-jre
+
+# deployment unit
+COPY target/service-scan-server-*-jar-with-dependencies.jar /scanserver/service-scan-server-*-jar-with-dependencies.jar
+EXPOSE 4810
+CMD ["java", "-jar", "/scanserver/service-scan-server-*-jar-with-dependencies.jar"]
diff --git a/services/scan-server/pom.xml b/services/scan-server/pom.xml
index fad2324f05..07e7570816 100644
--- a/services/scan-server/pom.xml
+++ b/services/scan-server/pom.xml
@@ -73,6 +73,16 @@
       <groupId>org.phoebus</groupId>
       <artifactId>core-util</artifactId>
       <version>5.0.3-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.ws.rs</groupId>
+          <artifactId>javax.ws.rs-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.tika</groupId>
+          <artifactId>tika-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.phoebus</groupId>
@@ -139,6 +149,31 @@
           <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.8.0</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>org.csstudio.scan.server.ScanServerInstance</mainClass>
+            </manifest>
+          </archive>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+        <executions>
+          <execution>
+            <id>assemble-all</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

From 8473312678b5fcbbd01e459fc358a1b539f72b7e Mon Sep 17 00:00:00 2001
From: georgweiss <georg.weiss@ess.eu>
Date: Tue, 3 Mar 2026 16:26:56 +0100
Subject: [PATCH 2/3] Dockerfile for scan server, also exclusion of unneeded
 dependencies from core

---
 services/scan-server/docker-compose.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 services/scan-server/docker-compose.yml

diff --git a/services/scan-server/docker-compose.yml b/services/scan-server/docker-compose.yml
new file mode 100644
index 0000000000..b1d0774053
--- /dev/null
+++ b/services/scan-server/docker-compose.yml
@@ -0,0 +1,16 @@
+services:
+  saveandrestore:
+    image: ghcr.io/controlsystemstudio/phoebus/service-save-and-restore:master
+    ports:
+      - "8080:8080"
+    environment:
+      ELASTICSEARCH_NETWORK_HOST: ${ELASTIC_HOST_IP_ADDRESS}
+      EPICS_PVA_ADDR_LIST: ${HOST_IP_ADDRESS}
+      EPICS_PVA_AUTO_ADDR_LIST: "NO"  
+      EPICS_PVA_ENABLE_IPV6: "false"  
+    command: >
+      /bin/bash -c "
+        java -DdefaultProtocol=pva -Dauthorization.permitall=false -Dauth.impl=demo -jar /saveandrestore/service-save-and-restore-*.jar"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+

From b1f6ef2b57431871c8c9dfa62643d0388e120472 Mon Sep 17 00:00:00 2001
From: georgweiss <georg.weiss@ess.eu>
Date: Wed, 4 Mar 2026 10:20:14 +0100
Subject: [PATCH 3/3] Relaxing Docker stuff for now

---
 services/scan-server/Dockerfile         |  6 ------
 services/scan-server/docker-compose.yml | 16 ----------------
 2 files changed, 22 deletions(-)
 delete mode 100644 services/scan-server/Dockerfile
 delete mode 100644 services/scan-server/docker-compose.yml

diff --git a/services/scan-server/Dockerfile b/services/scan-server/Dockerfile
deleted file mode 100644
index 99def0673a..0000000000
--- a/services/scan-server/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM eclipse-temurin:17-jre
-
-# deployment unit
-COPY target/service-scan-server-*-jar-with-dependencies.jar /scanserver/service-scan-server-*-jar-with-dependencies.jar
-EXPOSE 4810
-CMD ["java", "-jar", "/scanserver/service-scan-server-*-jar-with-dependencies.jar"]
diff --git a/services/scan-server/docker-compose.yml b/services/scan-server/docker-compose.yml
deleted file mode 100644
index b1d0774053..0000000000
--- a/services/scan-server/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-services:
-  saveandrestore:
-    image: ghcr.io/controlsystemstudio/phoebus/service-save-and-restore:master
-    ports:
-      - "8080:8080"
-    environment:
-      ELASTICSEARCH_NETWORK_HOST: ${ELASTIC_HOST_IP_ADDRESS}
-      EPICS_PVA_ADDR_LIST: ${HOST_IP_ADDRESS}
-      EPICS_PVA_AUTO_ADDR_LIST: "NO"  
-      EPICS_PVA_ENABLE_IPV6: "false"  
-    command: >
-      /bin/bash -c "
-        java -DdefaultProtocol=pva -Dauthorization.permitall=false -Dauth.impl=demo -jar /saveandrestore/service-save-and-restore-*.jar"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-