diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2018-02-13 14:27:15 +0100 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2018-02-13 14:27:15 +0100 |
| commit | 2e819d59934b5308bc58d6c69709112e2a6af402 (patch) | |
| tree | 320532fb50b0f20ac8bb4976b2825f8003aa3f85 /opendc-model-odc/setup | |
| parent | 407877ff24d3c54747c8b15bba73b93b38c8b6e7 (diff) | |
refactor(#18): Fix OpenDC model deployment
This change fixes the deployment of the OpenDC simulation model.
Diffstat (limited to 'opendc-model-odc/setup')
| -rw-r--r-- | opendc-model-odc/setup/Dockerfile | 5 | ||||
| -rw-r--r-- | opendc-model-odc/setup/build.gradle | 2 | ||||
| -rw-r--r-- | opendc-model-odc/setup/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaPlatformRunner.kt (renamed from opendc-model-odc/setup/src/main/kotlin/platform/JpaPlatformRunner.kt) | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/opendc-model-odc/setup/Dockerfile b/opendc-model-odc/setup/Dockerfile index 70e6fe11..bfebc044 100644 --- a/opendc-model-odc/setup/Dockerfile +++ b/opendc-model-odc/setup/Dockerfile @@ -17,7 +17,7 @@ USER root WORKDIR $APP_HOME # Build the application -RUN gradle --no-daemon :opendc-model-odc:setup:installDist +RUN gradle --no-daemon assemble installDist # Fix permissions RUN chown -R gradle:gradle $APP_HOME @@ -26,5 +26,4 @@ RUN chown -R gradle:gradle $APP_HOME USER gradle # Start the Gradle application on run -CMD opendc-odc-model/setup/build/install/setup/bin/setup - +CMD opendc-model-odc/setup/build/install/setup/bin/setup diff --git a/opendc-model-odc/setup/build.gradle b/opendc-model-odc/setup/build.gradle index ddb5860b..1cca2a6e 100644 --- a/opendc-model-odc/setup/build.gradle +++ b/opendc-model-odc/setup/build.gradle @@ -44,7 +44,7 @@ apply plugin: 'application' apply plugin: 'kotlin' apply plugin: 'org.jetbrains.dokka' -mainClassName = "nl.atlarge.opendc.model.odc.platform.JpaPlatformRunnerKt" +mainClassName = "com.atlarge.opendc.model.odc.platform.JpaPlatformRunnerKt" compileKotlin { kotlinOptions { diff --git a/opendc-model-odc/setup/src/main/kotlin/platform/JpaPlatformRunner.kt b/opendc-model-odc/setup/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaPlatformRunner.kt index 8fe49844..eb819a5b 100644 --- a/opendc-model-odc/setup/src/main/kotlin/platform/JpaPlatformRunner.kt +++ b/opendc-model-odc/setup/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaPlatformRunner.kt @@ -22,7 +22,7 @@ * SOFTWARE. */ -package platform +package com.atlarge.opendc.model.odc.platform import com.atlarge.opendc.model.odc.platform.JpaExperimentManager import com.atlarge.opendc.omega.OmegaKernelFactory |