Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}/

Expand Down
4 changes: 2 additions & 2 deletions api/src/main/resources/config/application-dev.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down