From e7cb8cf469dc414ca640f9c309cd54c838b3b591 Mon Sep 17 00:00:00 2001 From: Pierre Tellier Date: Wed, 12 Feb 2025 11:34:11 +0100 Subject: [PATCH] feat: single .env file --- Makefile | 22 +++++++++++-------- .../src/main/resources/application.properties | 9 +++----- config/{frontdev.main.env => backdev.env} | 8 +++++++ config/backdev.front.env | 5 ----- config/{backdev.main.env => frontdev.env} | 10 ++++++++- config/frontdev.front.env | 5 ----- config/{prod.main.env => prod.env} | 8 +++++++ config/prod.front.env | 5 ----- 8 files changed, 41 insertions(+), 31 deletions(-) rename config/{frontdev.main.env => backdev.env} (64%) delete mode 100644 config/backdev.front.env rename config/{backdev.main.env => frontdev.env} (56%) delete mode 100644 config/frontdev.front.env rename config/{prod.main.env => prod.env} (61%) delete mode 100644 config/prod.front.env diff --git a/Makefile b/Makefile index 26d5ccb..1e3a808 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ clean: @rm -f docker-compose.yaml @rm -f .env @rm -f front/MyINPulse-front/.env - + @rm -f MyINPulse-back/.env # Install npm packages front/MyINPulse-front/.installed: @@ -18,24 +18,28 @@ vite: ./front/MyINPulse-front/.installed dev-front: clean vite - @cp config/frontdev.front.env front/MyINPulse-front/.env - @cp config/frontdev.main.env .env + @cp config/frontdev.env front/MyINPulse-front/.env + @cp config/frontdev.env .env + @cp config/frontdev.env MyINPulse-back/.env @cp config/frontdev.docker-compose.yaml docker-compose.yaml @docker compose up -d --build @cd ./front/MyINPulse-front/ && npm run dev prod: clean - @cp config/prod.front.env front/MyINPulse-front/.env - @cp config/prod.main.env .env + @cp config/prod.env front/MyINPulse-front/.env + @cp config/prod.env .env + @cp config/prod.env .env @cp config/prod.docker-compose.yaml docker-compose.yaml @docker compose up -d --build dev-back: - @cp config/backdev.front.env front/MyINPulse-front/.env - @cp config/backdev.main.env .env + @cp config/backdev.env front/MyINPulse-front/.env + @cp config/backdev.env .env + @cp config/backdev.env MyINPulse-back/.env @cp config/backdev.docker-compose.yaml docker-compose.yaml @docker compose up -d --build - @echo "cd MyINPulse-back" - @echo "./gradlew bootRun --args='--server.port=8081'" \ No newline at end of file + @echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)' + @echo "./gradlew bootRun --args='--server.port=8081'" + \ No newline at end of file diff --git a/MyINPulse-back/src/main/resources/application.properties b/MyINPulse-back/src/main/resources/application.properties index e67e4f6..cc1afe6 100644 --- a/MyINPulse-back/src/main/resources/application.properties +++ b/MyINPulse-back/src/main/resources/application.properties @@ -2,11 +2,8 @@ spring.application.name=myinpulse spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:7080/realms/test/protocol/openid-connect/certs spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:7080/realms/test logging.level.org.springframework.security=DEBUG -#spring.datasource.url=jdbc:postgresql://postgres/${POSTGRES_DB} -spring.datasource.url=jdbc:postgresql://localhost:5433/backend_db -spring.datasource.username=backend_db_user -spring.datasource.password=backend_db_user_password +spring.datasource.url=jdbc:postgresql://${DATABASE_URL}/${BACKEND_DB} +spring.datasource.username=${BACKEND_USER} +spring.datasource.password=${BACKEND_PASSWORD} spring.jpa.hibernate.ddl-auto=update spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect - -spring.data.rest.base-path=/my/base/path \ No newline at end of file diff --git a/config/frontdev.main.env b/config/backdev.env similarity index 64% rename from config/frontdev.main.env rename to config/backdev.env index 26c2803..a7e5517 100644 --- a/config/frontdev.main.env +++ b/config/backdev.env @@ -12,3 +12,11 @@ KEYCLOAK_PASSWORD=keycloak_db_user_password BACKEND_DB=backend_db BACKEND_USER=backend_db_user BACKEND_PASSWORD=backend_db_user_password + +DATABASE_URL=localhost:5433 + +VITE_KEYCLOAK_URL=http://localhost:7080 +VITE_KEYCLOAK_CLIENT_ID=myinpulse +VITE_KEYCLOAK_REALM=test +VITE_APP_URL=http://localhost:8080 +VITE_BACKEND_URL=http://localhost:8081/ diff --git a/config/backdev.front.env b/config/backdev.front.env deleted file mode 100644 index 27cf54e..0000000 --- a/config/backdev.front.env +++ /dev/null @@ -1,5 +0,0 @@ -VITE_KEYCLOAK_URL=http://localhost:7080 -VITE_KEYCLOAK_CLIENT_ID=myinpulse -VITE_KEYCLOAK_REALM=test -VITE_APP_URL=http://localhost:8080 -VITE_BACKEND_URL=http://localhost:8081/ diff --git a/config/backdev.main.env b/config/frontdev.env similarity index 56% rename from config/backdev.main.env rename to config/frontdev.env index 2a597c3..ed4a23b 100644 --- a/config/backdev.main.env +++ b/config/frontdev.env @@ -11,4 +11,12 @@ KEYCLOAK_PASSWORD=keycloak_db_user_password BACKEND_DB=backend_db BACKEND_USER=backend_db_user -BACKEND_PASSWORD=backend_db_user_password \ No newline at end of file +BACKEND_PASSWORD=backend_db_user_password + +DATABASE_URL=MyINPulse-DB + +VITE_KEYCLOAK_URL=http://localhost:7080 +VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev +VITE_KEYCLOAK_REALM=test +VITE_APP_URL=http://localhost:5173 +VITE_BACKEND_URL=http://localhost:8081/ diff --git a/config/frontdev.front.env b/config/frontdev.front.env deleted file mode 100644 index 5eba221..0000000 --- a/config/frontdev.front.env +++ /dev/null @@ -1,5 +0,0 @@ -VITE_KEYCLOAK_URL=http://localhost:7080 -VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev -VITE_KEYCLOAK_REALM=test -VITE_APP_URL=http://localhost:5173 -VITE_BACKEND_URL=http://localhost:8081/ diff --git a/config/prod.main.env b/config/prod.env similarity index 61% rename from config/prod.main.env rename to config/prod.env index 179d92c..2fb8da9 100644 --- a/config/prod.main.env +++ b/config/prod.env @@ -12,3 +12,11 @@ KEYCLOAK_PASSWORD=keycloak_db_user_password BACKEND_DB=backend_db BACKEND_USER=backend_db_user BACKEND_PASSWORD=backend_db_user_password + +DATABASE_URL=MyINPulse-DB + +VITE_KEYCLOAK_URL=https://0549cd63f912d5dc9b31278d6f.eirb.fr +VITE_KEYCLOAK_CLIENT_ID=myinpulse-eirb +VITE_KEYCLOAK_REALM=test +VITE_APP_URL=https://0549cd63f912d5dc9b31278d6f.piair.dev +VITE_BACKEND_URL=http://TODO/ diff --git a/config/prod.front.env b/config/prod.front.env deleted file mode 100644 index cb42a37..0000000 --- a/config/prod.front.env +++ /dev/null @@ -1,5 +0,0 @@ -VITE_KEYCLOAK_URL=https://0549cd63f912d5dc9b31278d6f.eirb.fr -VITE_KEYCLOAK_CLIENT_ID=myinpulse-eirb -VITE_KEYCLOAK_REALM=test -VITE_APP_URL=https://0549cd63f912d5dc9b31278d6f.piair.dev -VITE_BACKEND_URL=http://TODO/