From 4a1ddfd7b301160a384c2d137795bdad2e77c752 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Thu, 22 Jul 2021 16:36:20 +0200
Subject: [PATCH] change default values
---
theodolite/.dockerignore | 1 -
theodolite/src/main/docker/Dockerfile.jvm | 2 --
theodolite/src/main/docker/Dockerfile.native | 2 --
.../main/kotlin/theodolite/execution/TheodoliteStandalone.kt | 4 ++--
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/theodolite/.dockerignore b/theodolite/.dockerignore
index 509eac55f..680e53567 100644
--- a/theodolite/.dockerignore
+++ b/theodolite/.dockerignore
@@ -3,4 +3,3 @@
!build/*-runner.jar
!build/lib/*
!build/quarkus-app/*
-!config/*
diff --git a/theodolite/src/main/docker/Dockerfile.jvm b/theodolite/src/main/docker/Dockerfile.jvm
index e0e5f42b7..4d51240e0 100644
--- a/theodolite/src/main/docker/Dockerfile.jvm
+++ b/theodolite/src/main/docker/Dockerfile.jvm
@@ -44,8 +44,6 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
COPY build/lib/* /deployments/lib/
COPY build/*-runner.jar /deployments/app.jar
-COPY config/ /deployments/config/
-COPY examples/ /deployments/examples/
EXPOSE 8080
USER 1001
diff --git a/theodolite/src/main/docker/Dockerfile.native b/theodolite/src/main/docker/Dockerfile.native
index 5b49df3be..95ef4fb51 100644
--- a/theodolite/src/main/docker/Dockerfile.native
+++ b/theodolite/src/main/docker/Dockerfile.native
@@ -20,8 +20,6 @@ RUN chown 1001 /deployments \
&& chmod "g+rwX" /deployments \
&& chown 1001:root /deployments
COPY --chown=1001:root build/*-runner /deployments/application
-COPY config/ /deployments/config/
-COPY examples/ /deployments/examples/
EXPOSE 8080
USER 1001
diff --git a/theodolite/src/main/kotlin/theodolite/execution/TheodoliteStandalone.kt b/theodolite/src/main/kotlin/theodolite/execution/TheodoliteStandalone.kt
index 6b4a0bc88..76fd7f707 100644
--- a/theodolite/src/main/kotlin/theodolite/execution/TheodoliteStandalone.kt
+++ b/theodolite/src/main/kotlin/theodolite/execution/TheodoliteStandalone.kt
@@ -31,8 +31,8 @@ class TheodoliteStandalone {
fun start() {
logger.info { "Theodolite started" }
- val executionPath = System.getenv("THEODOLITE_EXECUTION") ?: "./examples/standalone/example-execution.yaml"
- val benchmarkPath = System.getenv("THEODOLITE_BENCHMARK") ?: "./examples/standalone/example-benchmark.yaml"
+ val executionPath = System.getenv("THEODOLITE_EXECUTION") ?: "execution/execution.yaml"
+ val benchmarkPath = System.getenv("THEODOLITE_BENCHMARK") ?: "benchmark/benchmark.yaml"
logger.info { "Using $executionPath for BenchmarkExecution" }
logger.info { "Using $benchmarkPath for BenchmarkType" }
--
GitLab