treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add distr

Browse source
This commit is contained in:
etreshenkov 2022-08-04 12:38:41 +03:00
parent 7b11adfa2e
commit ba1511037d
7 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/backend-api/pom.xml
View file

@ -52,7 +52,7 @@
<resource>
<directory>src/main/resources</directory>
<excludes>
<exclude>application.yaml</exclude>
<exclude>application.properties</exclude>
<exclude>keycloak.json</exclude>
</excludes>
<filtering>false</filtering>

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/BackendApiSettings.java
View file

@ -5,7 +5,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component;
@Component
@PropertySource("file:${spring.config.location}/application.yaml")
@PropertySource("file:${spring.config.location}/application.properties")
@ConfigurationProperties("backend-api")
public class BackendApiSettings {
public String getExampleSetting() {

13
clearing-parent/backend-api/src/main/resources/application.yaml → clearing-parent/backend-api/src/main/resources/application.properties
View file

@ -1,13 +1,8 @@
server:
port: 8080
servlet:
context-path: /backend-api
spring:
main:
web-application-type: servlet
server.port=8080
server.servlet.context-path=/backend-api
spring.main.web-application-type=servlet
backend-api:
example-setting: test
backend-api.example-setting=test
##keycloak

4
clearing-parent/dbf-exporter/src/main/resources/application.properties
View file

@ -1,3 +1,7 @@
server.port=8080
server.servlet.context-path=/exporter
spring.main.web-application-type=servlet
db.jdbc-url=jdbc:postgresql://10.200.200.133:5432/postgres
db.driver=org.postgresql.Driver
db.login=clearing

4
clearing-parent/dbf-importer/src/main/resources/application.properties
View file

@ -1,3 +1,7 @@
server.port=8080
server.servlet.context-path=/importer
spring.main.web-application-type=servlet
db.jdbc-url=jdbc:postgresql://10.200.200.133:5432/postgres
db.driver=org.postgresql.Driver
db.login=clearing

4
z-distr/pom.xml
View file

@ -96,8 +96,8 @@
<destinationFile>${folder.clearing.distr.modules}/backend-api/backend-api.jar</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_clearing_backend-api}/src/main/resources/application.yaml</sourceFile>
<destinationFile>${folder.clearing.distr.modules}/backend-api/application.yaml</destinationFile>
<sourceFile>${folder_root_clearing_backend-api}/src/main/resources/application.properties</sourceFile>
<destinationFile>${folder.clearing.distr.modules}/backend-api/application.properties</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_clearing_backend-api}/src/main/resources/keycloak.json</sourceFile>

2
z-distr/src/main/resources/distr/modules/backend-api/Dockerfile
View file

@ -1,7 +1,7 @@
FROM debian:stable-20220125-jdk17
ADD backend-api.jar /opt/clearing/bin/backend-api.jar
ADD application.yaml /opt/clearing/bin/application.yaml
ADD application.properties /opt/clearing/bin/application.properties
ADD keycloak.json /opt/clearing/bin/keycloak.json
USER root
ENTRYPOINT java -jar /opt/clearing/bin/backend-api.jar --spring.config.location=/opt/clearing/bin/