From 635ab09ee9840e29cdf3990a4bfc55d118145762 Mon Sep 17 00:00:00 2001
From: vran <vran_dev@foxmail.com>
Date: Mon, 18 Apr 2022 16:15:22 +0800
Subject: [PATCH] feat: add DATABASIR_JWT_SECRET config

---
 Dockerfile                                    | 3 ---
 api/src/main/resources/application.properties | 2 +-
 local.Dockerfile                              | 5 +----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 36c02fc..b88aebc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,4 @@ WORKDIR /app
 COPY --from=build /app/api/build/libs/databasir.jar /app/databasir.jar
 EXPOSE 8080
 
-#-Ddatabasir.datasource.username=${databasir.datasource.username}
-#-Ddatabasir.datasource.password=${databasir.datasource.password}
-#-Ddatabasir.datasource.url=${databasir.datasource.url}
 ENTRYPOINT ["sh", "-c","java -Ddatabasir.db.url=${DATABASIR_DB_URL} -Ddatabasir.db.username=${DATABASIR_DB_USERNAME} -Ddatabasir.db.password=${DATABASIR_DB_PASSWORD} -jar /app/databasir.jar"]
diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties
index baf91d4..10e19ec 100644
--- a/api/src/main/resources/application.properties
+++ b/api/src/main/resources/application.properties
@@ -12,4 +12,4 @@ spring.flyway.baseline-on-migrate=true
 spring.flyway.locations=classpath:db/migration
 # driver directory
 databasir.db.driver-directory=drivers
-databasir.jwt.secret=${random.uuid}
\ No newline at end of file
+databasir.jwt.secret=${DATABASIR_JWT_SECRET:${random.uuid}}
\ No newline at end of file
diff --git a/local.Dockerfile b/local.Dockerfile
index e3c6819..a464d62 100644
--- a/local.Dockerfile
+++ b/local.Dockerfile
@@ -3,7 +3,4 @@ WORKDIR /app
 ADD api/build/libs/databasir.jar /app/databasir.jar
 EXPOSE 8080
 
-#-Ddatabasir.datasource.username=${databasir.datasource.username}
-#-Ddatabasir.datasource.password=${databasir.datasource.password}
-#-Ddatabasir.datasource.url=${databasir.datasource.url}
-ENTRYPOINT ["sh", "-c","java -Ddatabasir.db.url=${DATABASIR_DB_URL} -Ddatabasir.db.username=${DATABASIR_DB_USERNAME} -Ddatabasir.db.password=${DATABASIR_DB_PASSWORD} -jar /app/databasir.jar"]
+ENTRYPOINT ["sh", "-c","java -XX:+PrintCommandLineFlags -Ddatabasir.db.url=${DATABASIR_DB_URL} -Ddatabasir.db.username=${DATABASIR_DB_USERNAME} -Ddatabasir.db.password=${DATABASIR_DB_PASSWORD} -jar /app/databasir.jar"]