From 19fff392efe08adbcd55934714e7a3edbcea7874 Mon Sep 17 00:00:00 2001
From: karnem <mikhail.karnevskiy@desy.de>
Date: Fri, 4 Aug 2023 19:30:55 +0200
Subject: [PATCH] Move part of docker file functionality to the script
---
.gitlab-ci.yml | 2 +-
deploy/build_env/services-linux/Dockerfile | 4 --
.../services-linux/receiver_kafka.json | 39 +++++++++++++++++++
deploy/build_env/services-linux/run_asapo.sh | 6 ++-
4 files changed, 45 insertions(+), 6 deletions(-)
create mode 100644 deploy/build_env/services-linux/receiver_kafka.json
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fad0bebc1..b85739962 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,7 +117,7 @@ test-services-linux-debug:
stage: test
script:
- cd $CI_PROJECT_DIR
- - bash /run_asapo.sh
+ - bash $CI_PROJECT_DIR/deploy/build_env/services-linux/run_asapo.sh
- cd $CI_PROJECT_DIR/build
- ctest --no-compress-output -T Test -L all -E "kafka|full_chain_monitoring|noaccess|restart|logger_fluentd" --output-on-failure --output-junit testResult.xml
tags:
diff --git a/deploy/build_env/services-linux/Dockerfile b/deploy/build_env/services-linux/Dockerfile
index 0f98bfa80..3f2bdad19 100644
--- a/deploy/build_env/services-linux/Dockerfile
+++ b/deploy/build_env/services-linux/Dockerfile
@@ -139,7 +139,3 @@ nisNetgroupTriple: (blabla2,-,)\n\
" > /etc/ldap/record.ldif
RUN mkdir -p /var/log/supervisord/
-
-COPY *.key /
-COPY supervisord.conf /etc/
-COPY run_asapo.sh /
diff --git a/deploy/build_env/services-linux/receiver_kafka.json b/deploy/build_env/services-linux/receiver_kafka.json
new file mode 100644
index 000000000..fc3afc321
--- /dev/null
+++ b/deploy/build_env/services-linux/receiver_kafka.json
@@ -0,0 +1,39 @@
+{
+ "MonitoringServer": "auto",
+ "PerformanceDbServer":"localhost:8086",
+ "MonitorPerformance": true,
+ "PerformanceDbName": "db_test",
+ "DatabaseServer":"auto",
+ "DiscoveryServer": "localhost:8410",
+ "DataServer": {
+ "AdvertiseURI": "127.0.0.1:8431",
+ "NThreads": 2,
+ "ListenPort": 8431,
+ "NetworkMode": ["tcp"]
+ },
+ "Metrics": {
+ "Expose": true,
+ "ListenPort": 8430
+ },
+ "DataCache": {
+ "Use": true,
+ "SizeGB": 1,
+ "ReservedShare": 10
+ },
+ "AuthorizationServer": "localhost:8412",
+ "AuthorizationInterval": 1000,
+ "ListenPort": 8411,
+ "Tag": "localhost",
+ "ReceiveToDiskThresholdMB":50,
+ "MaxNumPersistedStreams":100,
+ "LogLevel" : "debug",
+ "Kafka" : {
+ "Enabled" : true,
+ "KafkaClient": {
+ "metadata.broker.list": "BROKER_LIST"
+ },
+ "KafkaTopics": {
+ "asapo": {}
+ }
+ }
+ }
diff --git a/deploy/build_env/services-linux/run_asapo.sh b/deploy/build_env/services-linux/run_asapo.sh
index b62b0e453..9ac050991 100644
--- a/deploy/build_env/services-linux/run_asapo.sh
+++ b/deploy/build_env/services-linux/run_asapo.sh
@@ -7,9 +7,13 @@ cp build/monitoring/monitoring_server/asapo-monitoring-server /asapo-monitoring-
cp deploy/asapo_services_light/*json /
-# Two receiver configs (tcp and fabric) are required for tests
+# Several receiver configs (tcp and fabric) are required for tests
cp deploy/asapo_services_light/receiver.json /receiver_tcp.json
cp deploy/build_env/services-linux/receiver_fabric.json /
+cp deploy/build_env/services-linux/receiver_kafka.json /
+
+cp deploy/build_env/services-linux/*key /
+cp deploy/build_env/services-linux/supervisord.conf /etc/
cp build/deploy/asapo_services_light/nginx.conf /etc/nginx/nginx.conf
--
GitLab