diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..a178eab --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,41 @@ + +services: + mysql: + image: mysql:8.0 + container_name: recipe-demo-mysql + environment: + MYSQL_ROOT_PASSWORD: db_password + MYSQL_DATABASE: recipe-demo + MYSQL_USER: db_username + MYSQL_PASSWORD: db_password + ports: + - "3306:3306" + volumes: + - mysql_data:/var/lib/mysql + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + interval: 10s + timeout: 5s + retries: 5 + + recipe-app: + build: + context: . + dockerfile: Dockerfile + container_name: recipe-demo-app + depends_on: + mysql: + condition: service_healthy + ports: + - "8443:8443" + environment: + - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/recipe-demo + - SPRING_DATASOURCE_USERNAME=db_username + - SPRING_DATASOURCE_PASSWORD=db_password + - APP_SECRET_KEY=your_secret_key + - APP_FRONTEND_URL=http://localhost:5173 + volumes: + - ./keystore.p12:/app/keystore.p12 + +volumes: + mysql_data: \ No newline at end of file diff --git a/pom.xml b/pom.xml index 937417e..85076b6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.2 + 3.4.5 com.cwa @@ -27,7 +27,7 @@ - 17 + 24 @@ -49,6 +49,11 @@ lombok true + + io.swagger.core.v3 + swagger-annotations + 2.2.30 + org.springframework.boot spring-boot-starter-test @@ -119,3 +124,4 @@ + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 18855af..f395cde 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -25,13 +25,13 @@ logging: app: frontend-url: http://localhost:5173 - secret-key: your_secret_key + secret-key: 2Om+oLWjsmVB17belDyJMHxvfPcjP6yglLYYmOHzSeQ= expiration-time: 86400000 server: port: 8443 ssl: key-store: classpath:keystore.p12 - key-store-password: password + key-store-password: recipe key-store-type: PKCS12 - key-alias: your_alias \ No newline at end of file + key-alias: lokalhost \ No newline at end of file diff --git a/src/main/resources/keystore.p12 b/src/main/resources/keystore.p12 new file mode 100644 index 0000000..ad27fb6 Binary files /dev/null and b/src/main/resources/keystore.p12 differ