From e8d671f8292e6d9c93f749af49997e6c55611fd2 Mon Sep 17 00:00:00 2001 From: Edwin Santizo Date: Tue, 29 Nov 2022 15:19:09 -0700 Subject: [PATCH 1/2] created new docker file to create local image for spring app --- deploy/Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 deploy/Dockerfile diff --git a/deploy/Dockerfile b/deploy/Dockerfile new file mode 100644 index 000000000..e69de29bb From 4ce4015867ca8c78bfec28d0fe0a233bbd25cbb2 Mon Sep 17 00:00:00 2001 From: Edwin Santizo Date: Wed, 30 Nov 2022 12:57:12 -0700 Subject: [PATCH 2/2] modified quickstart to work with mvn pom version arg. --- Dockerfile | 4 +++- api/src/main/resources/config/application-dev.properties | 4 ++-- deploy/Dockerfile | 0 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 deploy/Dockerfile diff --git a/Dockerfile b/Dockerfile index 80889fd72..cd2e615f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,10 @@ RUN mvn clean install -P dockerfile-build ###################### FROM wguopensource/osmt-base:latest +ARG MVN_POM_VERSION + COPY --chown=${USER}:${USER} ./import ${BASE_DIR}/import/ -COPY --from=build --chown=${USER}:${USER} ${BASE_DIR}/build/api/target/osmt-*.jar ${BASE_DIR}/bin/osmt.jar +COPY --from=build --chown=${USER}:${USER} ${BASE_DIR}/build/api/target/osmt-api-${MVN_POM_VERSION}.jar ${BASE_DIR}/bin/osmt.jar ADD ./docker/ /${BASE_DIR}/ diff --git a/api/src/main/resources/config/application-dev.properties b/api/src/main/resources/config/application-dev.properties index bf4b9f23a..412ede621 100644 --- a/api/src/main/resources/config/application-dev.properties +++ b/api/src/main/resources/config/application-dev.properties @@ -1,7 +1,7 @@ db.showMissingCreateTableStatements=true -app.baseDomain=localhost:8080 -app.baseUrl=http://localhost:8080 +app.baseDomain=${BASE_DOMAIN:-localhost:8080} +app.baseUrl=${BASE_URL:-http://localhost:8080} # Spring Boot will serve frontend files via port 8080 # If you are using ng serve to proxy static files built by Angular, set OSMT_FRONT_END_PORT to 4200 diff --git a/deploy/Dockerfile b/deploy/Dockerfile deleted file mode 100644 index e69de29bb..000000000