Run DeLiKo export plugins via docker compose
diff --git a/data/exportPlugin.xl.conf b/data/exportPlugin.xl.conf
index c8094c4..54f6344 100644
--- a/data/exportPlugin.xl.conf
+++ b/data/exportPlugin.xl.conf
@@ -1,12 +1,12 @@
# Server Configuration
-server.port=7778
-server.host=10.10.14.225
+server.port=7777
+server.host=0.0.0.0
server.scheme=http
server.origin=https://korap.dnb.de/
# API Configuration
-api.port=8091
-api.host=10.10.14.225
+api.port=8089
+api.host=kustvakt
api.scheme=http
# Asset Configuration
diff --git a/data/exportPlugin.xs.conf b/data/exportPlugin.xs.conf
index 5133afe..a409ced 100644
--- a/data/exportPlugin.xs.conf
+++ b/data/exportPlugin.xs.conf
@@ -1,12 +1,12 @@
# Server Configuration
server.port=7777
-server.host=10.10.14.225
+server.host=0.0.0.0
server.scheme=http
server.origin=https://korap.dnb.de/deliko
# API Configuration
api.port=8089
-api.host=10.10.14.225
+api.host=kustvakt
api.scheme=http
# Asset Configuration
diff --git a/data/kalamar-xl.conf b/data/kalamar-xl.conf
index d92fa14..41a6611 100644
--- a/data/kalamar-xl.conf
+++ b/data/kalamar-xl.conf
@@ -37,7 +37,7 @@
},
proxies => [{
root_path => '/plugin/export',
- mount => 'http://10.10.14.225:7778',
+ mount => 'http://kalamar-export-plugin:7777',
service => 'export-plugin-proxy'
}],
},
diff --git a/data/kalamar.xs.conf b/data/kalamar.xs.conf
index 10cba58..68a0e8f 100644
--- a/data/kalamar.xs.conf
+++ b/data/kalamar.xs.conf
@@ -37,7 +37,7 @@
},
proxies => [{
root_path => '/plugin/export',
- mount => 'http://10.10.14.225:7777',
+ mount => 'http://kalamar-export-plugin:7777',
service => 'export-plugin-proxy'
}],
},
diff --git a/deliko-xl-compose.yml b/deliko-xl-compose.yml
index a4471ab..0fec832 100644
--- a/deliko-xl-compose.yml
+++ b/deliko-xl-compose.yml
@@ -44,3 +44,15 @@
profiles:
- lite
restart: "unless-stopped"
+ kalamar-export-plugin:
+ image: "korap/kalamar-plugin-export:latest"
+ depends_on:
+ - kustvakt
+ - kalamar
+ volumes:
+ - type: bind
+ source: ./data/exportPlugin.xl.conf
+ target: /export/exportPlugin.conf
+ profiles:
+ - lite
+ restart: "unless-stopped"
diff --git a/korap4dnb-compose.yml b/korap4dnb-compose.yml
index 37351df..c2262af 100644
--- a/korap4dnb-compose.yml
+++ b/korap4dnb-compose.yml
@@ -46,3 +46,15 @@
profiles:
- lite
restart: "unless-stopped"
+ kalamar-export-plugin:
+ image: "korap/kalamar-plugin-export:latest"
+ depends_on:
+ - kustvakt
+ - kalamar
+ volumes:
+ - type: bind
+ source: ./data/exportPlugin.xs.conf
+ target: /export/exportPlugin.conf
+ profiles:
+ - lite
+ restart: "unless-stopped"
diff --git a/lib/KalamarExportPlugin-0.3.1.jar b/lib/KalamarExportPlugin-0.3.1.jar
deleted file mode 100644
index 46ec03c..0000000
--- a/lib/KalamarExportPlugin-0.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/lib/KalamarExportPlugin.jar b/lib/KalamarExportPlugin.jar
deleted file mode 120000
index bbc4b27..0000000
--- a/lib/KalamarExportPlugin.jar
+++ /dev/null
@@ -1 +0,0 @@
-KalamarExportPlugin-0.3.1.jar
\ No newline at end of file
diff --git a/scripts/start-kalamar-export-plugins.sh b/scripts/start-kalamar-export-plugins.sh
deleted file mode 100755
index fba73b8..0000000
--- a/scripts/start-kalamar-export-plugins.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-wd=.
-mkdir -p $wd/log
-mkdir -p $wd/files
-nohup java -jar $wd/lib/KalamarExportPlugin.jar $wd/data/exportPlugin.xs.conf > $wd/log/kalamar-xs.export.log 2>&1 & echo $! > $wd/kalamar-xs.export.pid &
-nohup java -jar $wd/lib/KalamarExportPlugin-0.3.1.jar $wd/data/exportPlugin.xl.conf > $wd/log/kalamar-xl.export.log 2>&1 & echo $! > $wd/kalamar-xl.export.pid &