feat: new makefile option
This commit is contained in:
		
							
								
								
									
										14
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								Makefile
									
									
									
									
									
								
							| @@ -1,7 +1,10 @@ | |||||||
| help: | help: | ||||||
| 	@echo "make [clean dev-front prod dev-back]" | 	@echo "make [clean dev-front prod dev-back dev]" | ||||||
|  |  | ||||||
| clean:  | clean:  | ||||||
|  | 	@cp config/frontdev.env front/MyINPulse-front/.env | ||||||
|  | 	@cp config/frontdev.env .env | ||||||
|  | 	@cp config/frontdev.env MyINPulse-back/.env | ||||||
| 	@cp config/prod.docker-compose.yaml docker-compose.yaml | 	@cp config/prod.docker-compose.yaml docker-compose.yaml | ||||||
| 	@docker compose down | 	@docker compose down | ||||||
| 	@rm -f docker-compose.yaml | 	@rm -f docker-compose.yaml | ||||||
| @@ -43,3 +46,12 @@ dev-back: | |||||||
| 	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)' | 	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)' | ||||||
| 	@echo "./gradlew bootRun --args='--server.port=8081'" | 	@echo "./gradlew bootRun --args='--server.port=8081'" | ||||||
| 	 | 	 | ||||||
|  | dev: clean vite | ||||||
|  | 	@cp config/dev.env front/MyINPulse-front/.env | ||||||
|  | 	@cp config/dev.env .env | ||||||
|  | 	@cp config/dev.env MyINPulse-back/.env | ||||||
|  | 	@cp config/dev.docker-compose.yaml docker-compose.yaml | ||||||
|  | 	@docker compose up -d --build | ||||||
|  | 	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)' | ||||||
|  | 	@echo "./gradlew bootRun --args='--server.port=8081'" | ||||||
|  | 	@cd ./front/MyINPulse-front/ && npm run dev & | ||||||
|   | |||||||
							
								
								
									
										52
									
								
								config/dev.docker-compose.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										52
									
								
								config/dev.docker-compose.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,52 @@ | |||||||
|  | services: | ||||||
|  |   postgres: | ||||||
|  |     env_file: .env | ||||||
|  |     build: | ||||||
|  |       context: postgres/ | ||||||
|  |       dockerfile: Dockerfile | ||||||
|  |     container_name: MyINPulse-DB | ||||||
|  |     ports: | ||||||
|  |       - 5433:5432 | ||||||
|  |     volumes: | ||||||
|  |       - ./postgres/data:/var/lib/postgresql/data | ||||||
|  |  | ||||||
|  |  | ||||||
|  |   keycloak: | ||||||
|  |     container_name: MyINPulse-keycloak | ||||||
|  |     build: | ||||||
|  |       context: ./keycloak | ||||||
|  |       dockerfile: Dockerfile | ||||||
|  |       args: | ||||||
|  |         KC_DB: postgres | ||||||
|  |         KC_DB_URL: jdbc:postgresql://postgres/${POSTGRES_DB} | ||||||
|  |         KC_DB_USERNAME: ${POSTGRES_USER} | ||||||
|  |         KC_DB_PASSWORD: ${POSTGRES_PASSWORD} | ||||||
|  |     environment: | ||||||
|  |       KC_HOSTNAME_PORT: 7080 | ||||||
|  |       KC_HOSTNAME_STRICT_BACKCHANNEL: "true" | ||||||
|  |       KC_BOOTSTRAP_ADMIN_USERNAME: ${KEYCLOAK_ADMIN} | ||||||
|  |       KC_BOOTSTRAP_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD} | ||||||
|  |       KC_LOG_LEVEL: info | ||||||
|  |     command: ["start-dev", "--http-port", "7080", "--https-port", "7443", "--hostname", "${KEYCLOAK_HOSTNAME}"] | ||||||
|  |     ports: | ||||||
|  |       - "7080:7080" | ||||||
|  |       - "7443:7443" | ||||||
|  |     depends_on: | ||||||
|  |       - postgres | ||||||
|  |  | ||||||
|  |   #front: | ||||||
|  |   #  build: | ||||||
|  |   #    context: ./front/ | ||||||
|  |   #    dockerfile: Dockerfile | ||||||
|  |   #  container_name: MyINPulse-front | ||||||
|  |   #  ports: | ||||||
|  |   #    - "8080:80" | ||||||
|  |  | ||||||
|  |   #back: | ||||||
|  |   #  build: | ||||||
|  |   #    context: ./MyINPulse-back/ | ||||||
|  |   #    dockerfile: Dockerfile | ||||||
|  |   #  container_name: MyINPulse-back | ||||||
|  |   #  ports: | ||||||
|  |   #    - "8081:8080" | ||||||
|  |    | ||||||
							
								
								
									
										22
									
								
								config/dev.env
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								config/dev.env
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,22 @@ | |||||||
|  | POSTGRES_DB=postgres_db | ||||||
|  | POSTGRES_USER=postgres | ||||||
|  | POSTGRES_PASSWORD=postgres_db_user_password | ||||||
|  |  | ||||||
|  | KEYCLOAK_ADMIN=admin | ||||||
|  | KEYCLOAK_ADMIN_PASSWORD=admin | ||||||
|  | KEYCLOAK_HOSTNAME=localhost | ||||||
|  | KEYCLOAK_DB=keycloak_db | ||||||
|  | KEYCLOAK_USER=keycloak_db_user | ||||||
|  | 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-dev | ||||||
|  | VITE_KEYCLOAK_REALM=test | ||||||
|  | VITE_APP_URL=http://localhost:5173 | ||||||
|  | VITE_BACKEND_URL=http://localhost:8081/ | ||||||
		Reference in New Issue
	
	Block a user