diff --git a/theodolite/.dockerignore b/theodolite/.dockerignore index 509eac55fb76631ce8966847be69b39095688801..680e535674de90720f521c92a5ad518100f906b8 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 e0e5f42b7003cbffd71bb0755d82efe3697cc04b..4d51240e0225bb571cc4a625e40c9ec76fd8f10d 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 5b49df3be5c7c0df4f84b679e86ce58c773a73ce..95ef4fb51d7dc1ac520fb4c5a9af1b2d0a32fd09 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 6b4a0bc8855cb821f226a5fb4c0b41c95cafe956..76fd7f707a3e190ff6c61052ae4b5aaf50459418 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" }