From 5bd8ddffeb8f8db6b09c0513d040926f941c0240 Mon Sep 17 00:00:00 2001
From: Liosha <Liosha84@gmail.com>
Date: Sat, 25 Apr 2026 11:25:41 +0300
Subject: [PATCH] fix: add gradle wrapper and enable env vars

---
 Dockerfile                                     | 14 ++++++++------
 src/main/resources/application-prod.properties | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 764692f..092255e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,15 +7,17 @@ RUN apt-get update && apt-get install -y curl && \
     apt-get install -y nodejs
 
 WORKDIR /app
+# 1. Сначала копируем файлы обертки Gradle
+COPY gradlew .
+COPY gradle gradle
 
-# Копируем всё содержимое проекта
+# 2. Даем права на исполнение
+RUN chmod +x gradlew
+
+# 3. Копируем исходники (включая Angular и Java части)
 COPY . .
 
-# Даем права на выполнение Gradle
-RUN chmod +x ./gradlew
-
-# Запускаем твою "педаль" через Gradle
-# Она сама соберет Angular, почистит статику и соберет Jar
+# 4. Теперь твоя "педаль" сработает
 RUN ./gradlew copyAngularBuild_prod bootJar -x test
 
 # Финальный легковесный образ
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 8666e8c..7bf2476 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -5,17 +5,23 @@ spring.application.name=jambotron
 server.port=8081
 #============Localhost Configurations========================
 
-spring.datasource.url= jdbc:postgresql://localhost:5432/jambotronDB
-spring.datasource.username= admin
-spring.datasource.password= postgrespw
+#spring.datasource.url= jdbc:postgresql://localhost:5432/jambotronDB
+#spring.datasource.username= admin
+#spring.datasource.password= postgrespw
 
 spring.flyway.baseline-on-migrate=true
 spring.flyway.validate-on-migrate=true
 
-spring.flyway.url=jdbc:postgresql://localhost:5432/jambotronDB
-spring.flyway.user=admin
-spring.flyway.password=postgrespw
+#spring.flyway.url=jdbc:postgresql://localhost:5432/jambotronDB
+#spring.flyway.user=admin
+#spring.flyway.password=postgrespw
 
+spring.datasource.url=${SPRING_DATASOURCE_URL}
+spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
+spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
+spring.flyway.url=${SPRING_FLYWAY_URL}
+spring.flyway.user=${SPRING_FLYWAY_USER}
+spring.flyway.password=${SPRING_FLYWAY_PASSWORD}
 
 #============Koyeb Configurations========================