From a490bb2219550555af77ee7b20cb382824e07f53 Mon Sep 17 00:00:00 2001 From: Lars Johansson <lars.johansson@ess.eu> Date: Mon, 29 Aug 2022 11:34:36 +0200 Subject: [PATCH] Remove duplicate application properties --- Dockerfile | 2 +- .../resources/application-docker.properties | 40 ------------------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 src/main/resources/application-docker.properties diff --git a/Dockerfile b/Dockerfile index b6f255e0..2ebc7f9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,4 +7,4 @@ FROM openjdk:17 # deployment unit COPY target/naming-backend-*.jar /naming/naming-backend.jar -CMD ["java", "-jar", "/naming/naming-backend.jar", "--spring.config.name=application-docker"] +CMD ["java", "-jar", "/naming/naming-backend.jar", "--spring.config.name=application"] diff --git a/src/main/resources/application-docker.properties b/src/main/resources/application-docker.properties deleted file mode 100644 index c2fdc60f..00000000 --- a/src/main/resources/application-docker.properties +++ /dev/null @@ -1,40 +0,0 @@ -# ------------------------------------------------------------------------------ -# Naming -# ------------------------------------------------------------------------------ - -# logging -logging.level.org.openepics.names=DEBUG -logutil.stacktrace.length=10 - -server.port=8083 - -spring.profiles.active=@spring.profiles.active@ - -# datasource -spring.datasource.url=jdbc:postgresql://postgres:5432/discs_names -spring.datasource.username=discs_names -spring.datasource.password=discs_names - -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -spring.jpa.hibernate.ddl-auto=none -spring.jpa.hibernate.show-sql=true - -# swagger uI -app.version=0.0.1-SNAPSHOT -openapi.externaldocs.description=ESS Naming Convention -openapi.externaldocs.url=https://chess.esss.lu.se/enovia/link/ESS-0000757/21308.51166.45568.45993/valid -openapi.info.contact.email=Icsscontrolsystemsupport@esss.se -openapi.info.contact.name=Support -openapi.info.contact.url=https://jira.esss.lu.se/projects/NT/issues -openapi.info.description=\ - Perform Naming tasks Create Read Update Delete + Approve Cancel Reject \n\n \ - Here are some useful links \n \ - - [Naming](https://confluence.esss.lu.se/display/SW/Naming+Tool%2C+Cable+DB%2C+CCDB%2C+IOC+Factory%2C+RBAC) in ICS Software toolchain \n \ - - [Introduction to Naming REST API](/pdfs/naming_rest_api_brief_introduction.pdf) + [Cheat Sheet](/pdfs/naming_rest_api_cheat_sheet.pdf) \n \ - - Excel templates for [names](/templates/NameElementCommand.xlsx) + [structures](/templates/StructureElementCommand.xlsx) \n\n \ - Note \n \ - - Observe which fields to use for operations client to server. \n \ - - Obsolete values are not shown unless history is requested. \n \ - - Regular expressions are not supported for searches. Regex-like behavior is available with _ underscore, 0 or 1 occurrences of any character, % percent, any number of any character. -openapi.info.license.name=Copyright (C) 2022 European Spallation Source ERIC. -openapi.info.title=Naming REST API -- GitLab