From 9e6e68411b52bb55a55ab8db5d32d003771ea60a Mon Sep 17 00:00:00 2001 From: RM Date: Wed, 30 Sep 2026 18:07:55 +0300 Subject: [PATCH] hide creds in env --- .gitignore | 5 +++++ Dockerfile | 4 ++-- docker-compose.yaml | 9 +++++++-- src/main/resources/application.properties | 18 +++++++++--------- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 667aaef..3df5e11 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,8 @@ build/ ### VS Code ### .vscode/ + +### Environment variables ### +.env +application-prod.properties +application-local.properties diff --git a/Dockerfile b/Dockerfile index df61c95..bbcef40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM amazoncorretto:25-alpine-jdk +FROM amazoncorretto:26-alpine-jdk COPY torgi-0.0.1-SNAPSHOT.jar /home/torgi-0.0.1-SNAPSHOT.jar -CMD ["java", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=75", "-XX:InitialRAMPercentage=50", "-Xms512m", "-Xmx4096m", "-jar","/home/torgi-0.0.1-SNAPSHOT.jar","from:m.ryabyh@gmail.com","runHeadless:true","token:changeit","to:m.ryabyh@gmail.com,AAAtapina@sberbank.ru,Oreshkina.V.V@sberbank.ru,MEvRyabykh@sberbank.ru","days:1"] \ No newline at end of file +ENTRYPOINT ["java", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=75", "-XX:InitialRAMPercentage=50", "-Xms512m", "-Xmx4096m", "-jar", "/home/torgi-0.0.1-SNAPSHOT.jar"] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 9d166b0..70ff0d8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -12,8 +12,13 @@ services: environment: - SERVER_PORT=8181 - SPRING_DATASOURCE_URL=jdbc:postgresql://service-db/torgi - - SPRING_DATASOURCE_USERNAME=username - - SPRING_DATASOURCE_PASSWORD=password + - SPRING_DATASOURCE_USERNAME=${DB_USERNAME:-username} + - SPRING_DATASOURCE_PASSWORD=${DB_PASSWORD:-password} + - EMAIL_TOKEN=${EMAIL_TOKEN} + - EMAIL_FROM=${EMAIL_FROM:-m.ryabyh@gmail.com} + - EMAIL_TO=${EMAIL_TO:-m.ryabyh@gmail.com} + - SPECIAL_EMAIL=${SPECIAL_EMAIL:-m.ryabyh+torgi@gmail.com} + - ENABLE_EMAIL_SCAN=${ENABLE_EMAIL_SCAN:-false} restart: always healthcheck: test: wget --no-verbose --tries=1 --spider http://localhost:8181/health || exit 1 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 40770ff..916028f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,12 +1,12 @@ -pledge.params.from=changeit@gmail.com -pledge.params.token=changeit -pledge.params.to=m.ryabyh@gmail.com,AAAtapina@sberbank.ru,Oreshkina.V.V@sberbank.ru,MEvRyabykh@sberbank.ru -pledge.params.days=1 -pledge.params.special-email=m.ryabyh+torgi@gmail.com -pledge.params.enable-email-scan=false -spring.datasource.url=jdbc:postgresql://localhost:5432/torgi -spring.datasource.username=torgi -spring.datasource.password=17maxim02 +pledge.params.from=${EMAIL_FROM:m.ryabyh@gmail.com} +pledge.params.token=${EMAIL_TOKEN} +pledge.params.to=${EMAIL_TO:m.ryabyh@gmail.com,AAAtapina@sberbank.ru,Oreshkina.V.V@sberbank.ru,MEvRyabykh@sberbank.ru} +pledge.params.days=${EMAIL_DAYS:1} +pledge.params.special-email=${SPECIAL_EMAIL:m.ryabyh+torgi@gmail.com} +pledge.params.enable-email-scan=${ENABLE_EMAIL_SCAN:false} +spring.datasource.url=${DB_URL:jdbc:postgresql://localhost:5432/torgi} +spring.datasource.username=${DB_USERNAME:torgi} +spring.datasource.password=${DB_PASSWORD} spring.datasource.driver-class-name=org.postgresql.Driver spring.servlet.multipart.max-file-size=20MB spring.servlet.multipart.max-request-size=20MB