t

Dockerfile

@@ -1,5 +1,5 @@
 # Сборка приложения
-FROM gradle:7.6.1-jdk11 AS build
+FROM gradle:8.7-jdk21 AS build
 WORKDIR /app
 COPY build.gradle .
 COPY settings.gradle .
@@ -9,7 +9,7 @@ COPY gradle ./gradle
 RUN ./gradlew clean build -x test
 
 # Запуск приложения
-FROM openjdk:11-jre-slim
+FROM openjdk:21-jdk-slim
 WORKDIR /app
 COPY --from=build /app/build/libs/*.jar app.jar
 

build.gradle

@@ -55,6 +55,8 @@ dependencies {
     implementation group: 'io.hypersistence', name: 'hypersistence-utils-hibernate-63', version: '3.9.1'
 // https://mvnrepository.com/artifact/org.flywaydb/flyway-database-postgresql
     runtimeOnly group: 'org.flywaydb', name: 'flyway-database-postgresql', version: '11.3.1'
+// https://mvnrepository.com/artifact/org.postgresql/postgresql
+    implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.5'
 
 
 }

src/main/resources/application-secrets.properties

@@ -1,8 +0,0 @@
-# Telegram configuration
-bot.token=${BOT_TOKEN:5908676914:AAGU9LVyXYZYafpRgwOf1tolk0HGYvcHszY}
-bot.name=${BOT_NAME:TelegaBot}
-
-# Database configuration
-spring.datasource.url=${DB_URL:jdbc:postgresql://192.168.0.10:5432/telegabot}
-spring.datasource.username=${DB_USER:postgres}
-spring.datasource.password=${DB_PASSWORD:Vftrixpo05}

src/main/resources/application.properties

@@ -1,7 +1,17 @@
 spring.application.name=TelegaBot
+# Telegram configuration
+bot.token=5908676914:AAGU9LVyXYZYafpRgwOf1tolk0HGYvcHszY
+bot.name=TelegaBot
+
+# Database configuration
+spring.datasource.url=jdbc:postgresql://192.168.0.10:5432/telegabot
+spring.datasource.username=postgres
+spring.datasource.password=Vftrixpo05
+
 
 spring.jpa.hibernate.ddl-auto=validate
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.datasource.driver-class-name=org.postgresql.Driver
 
 # Flyway Configuration
 spring.flyway.enabled=true
@@ -9,6 +19,8 @@ spring.flyway.locations=classpath:db/migration
 spring.flyway.baseline-on-migrate=true
 spring.flyway.validate-on-migrate=true
 
+
+
 # ?????????? SQL-???????
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=false