diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f74a630..49dafc2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -58,8 +58,8 @@ jobs: docker run -d --name embula-backend -p 8081:8081 -e MYSQL_URL="$MYSQL_URL" -e MYSQL_USERNAME="$MYSQL_USERNAME" -e MYSQL_PASSWORD="$MYSQL_PASSWORD" -e JWT_SECRET="$JWT_SECRET" -e TOKEN_VALIDITY="$TOKEN_VALIDITY" -e REFRESH_TOKEN_VALIDITY="$REFRESH_TOKEN_VALIDITY" -e STRIPE_SECRET="$STRIPE_SECRET" -e EMAIL_USERNAME="$EMAIL_USERNAME" -e EMAIL_PASSWORD="$EMAIL_PASSWORD" -e ADMIN_EMAIL="$ADMIN_EMAIL" dewmink/embula-backend:latest env: MYSQL_URL: ${{ secrets.MYSQL_URL }} - MYSQL_USERNAME: ${{ secrets.DB_USERNAME }} - MYSQL_PASSWORD: ${{ secrets.DB_PASSWORD }} + MYSQL_USERNAME: ${{ secrets.MYSQL_USERNAME }} + MYSQL_PASSWORD: ${{ secrets.MYSQL_PASSWORD }} JWT_SECRET: ${{ secrets.JWT_SECRET }} TOKEN_VALIDITY: ${{ secrets.TOKEN_VALIDITY }} REFRESH_TOKEN_VALIDITY: ${{ secrets.REFRESH_TOKEN_VALIDITY }} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5227ca3..8c135f5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,8 +6,8 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.url =${MYSQL_URL} -spring.datasource.username= ${USERNAME} -spring.datasource.password=${PASSWORD} +spring.datasource.username= ${MYSQL_USERNAME} +spring.datasource.password=${MYSQL_PASSWORD} #jpa vendor adapter configuration spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect