diff --git a/.drone.yml b/.drone.yml index 5a792ee..dd7cd77 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,6 +31,11 @@ steps: - sed -i -e "s/localhost/tombiard-postgres_server/g" src/main/resources/application.properties - echo -e "\nserver.port=443\nserver.forward-headers-strategy=framework" >> src/main/resources/application.properties - mvn clean package + environment: + SPRING_DATASOURCE_URL: jdbc:postgresql://tombiard-postgres_server:5432/ScienceQuest + SPRING_DATASOURCE_USERNAME: ScienceQuest + SPRING_DATASOURCE_PASSWORD: + from_secret: postgres_password_secret # - name: deploy-container-adminer # image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest @@ -53,11 +58,6 @@ steps: from_secret: SECRET_REGISTRY_USERNAME password: from_secret: SECRET_REGISTRY_PASSWORD - environment: - SPRING_DATASOURCE_URL: jdbc:postgresql://tombiard-postgres_server:5432/ScienceQuest - SPRING_DATASOURCE_USERNAME: ScienceQuest - SPRING_DATASOURCE_PASSWORD: - from_secret: postgres_password_secret - name: deploy-container-app image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest diff --git a/SpringBootProject/src/main/resources/application.properties b/SpringBootProject/src/main/resources/application.properties index f5c7822..dc5ff83 100644 --- a/SpringBootProject/src/main/resources/application.properties +++ b/SpringBootProject/src/main/resources/application.properties @@ -1,6 +1,6 @@ -spring.datasource.url=${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/ScienceQuest} -spring.datasource.username=${SPRING_DATASOURCE_USERNAME:ScienceQuest} -spring.datasource.password=${SPRING_DATASOURCE_PASSWORD:94gg98mFnp269JY98P2pZtVnEd8UkWPm} +spring.datasource.url=jdbc:postgresql://localhost:5432/ScienceQuest +spring.datasource.username=ScienceQuest +spring.datasource.password=94gg98mFnp269JY98P2pZtVnEd8UkWPm spring.datasource.driver-class-name=org.postgresql.Driver spring.sql.init.mode=always spring.sql.init.schema-locations=classpath:schema.sql