trying to fix the env problem

maxih4 · Jul 3, 2024 · f868098 · f868098
1 parent 75282d6
commit f868098
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/.github/workflows/azure-container-webapp.yml b/.github/workflows/azure-container-webapp.yml
@@ -79,7 +79,6 @@ jobs:
           KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
           MYSQL_PASSWORD: ${{ secrets.MYSQL_PASSWORD }}
           MYSQL_USER: ${{ secrets.MYSQL_USER }}
-          TEST_ENV: "Hallo"
         with:
           push: true
           tags: ghcr.io/${{ env.REPO }}:${{ github.sha }}

diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,6 @@ RUN --mount=type=secret,id=JWT_SECRET \
     export KEYSTORE_PASS=$(cat /run/secrets/KEYSTORE_PASS) && \
     export MYSQL_PASSWORD=$(cat /run/secrets/MYSQL_PASSWORD) && \
     export MYSQL_USER=$(cat /run/secrets/MYSQL_USER) && \
-    export TEST_ENV=$(cat /run/secrets/TEST_ENV) && \
     mvn clean package spring-boot:repackage -f pom.xml
 
 FROM amazoncorretto:16

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -4,9 +4,7 @@
 
 
 
-spring.datasource.url=jdbc:mysql://mysql-2cfd3f0b-kickevent.g.aivencloud.com:13138/defaultdb?ssl-mode=REQUIRED
-spring.datasource.username=${MYSQL_USER}
-spring.datasource.password=${MYSQL_PASSWORD}
+spring.datasource.url=jdbc:mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@mysql-2cfd3f0b-kickevent.g.aivencloud.com:13138/defaultdb?ssl-mode=REQUIRED
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect
 spring.jpa.hibernate.ddl-auto=update