Compare commits
No commits in common. "52136a34bd1b5c385ba4f297fb7dd97c14f965f4" and "0013d07273dd798362caf4280b8bf63fb3caf46d" have entirely different histories.
52136a34bd
...
0013d07273
@ -49,7 +49,7 @@ dependencies {
|
|||||||
implementation 'org.springframework.boot:spring-boot-starter-security'
|
implementation 'org.springframework.boot:spring-boot-starter-security'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-webmvc'
|
implementation 'org.springframework.boot:spring-boot-starter-webmvc'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-jackson'
|
implementation 'org.springframework.boot:spring-boot-starter-jackson'
|
||||||
runtimeOnly 'org.postgresql:postgresql'
|
runtimeOnly 'com.mysql:mysql-connector-j'
|
||||||
testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test'
|
testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test'
|
||||||
testImplementation 'org.springframework.boot:spring-boot-starter-jackson-test'
|
testImplementation 'org.springframework.boot:spring-boot-starter-jackson-test'
|
||||||
testImplementation 'org.springframework.security:spring-security-test'
|
testImplementation 'org.springframework.security:spring-security-test'
|
||||||
|
|||||||
@ -1,26 +1,26 @@
|
|||||||
name: meals-made-easy-api-dev
|
name: meals-made-easy-api-dev
|
||||||
services:
|
services:
|
||||||
db:
|
db:
|
||||||
image: pgvector/pgvector:pg18-trixie
|
image: mysql:latest
|
||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- '55001:3306'
|
||||||
|
- '55000:33060'
|
||||||
env_file: .env
|
env_file: .env
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: meals_made_easy_api
|
MYSQL_DATABASE: meals_made_easy_api
|
||||||
POSTGRES_USER: meals-made-easy-api-user
|
MYSQL_USER: meals-made-easy-api-user
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB
|
test: mysqladmin ping -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
|
||||||
interval: 5s
|
interval: 5s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 10
|
retries: 10
|
||||||
start_period: 10s
|
|
||||||
volumes:
|
volumes:
|
||||||
- postgres-data:/var/lib/postgresql
|
- mysql-data:/var/lib/mysql
|
||||||
minio:
|
minio:
|
||||||
image: minio/minio:latest
|
image: minio/minio:latest
|
||||||
ports:
|
ports:
|
||||||
- "9000:9000"
|
- 9000:9000
|
||||||
- "9001:9001"
|
- 9001:9001
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
environment:
|
environment:
|
||||||
@ -32,6 +32,8 @@ services:
|
|||||||
- /data
|
- /data
|
||||||
- --console-address
|
- --console-address
|
||||||
- :9001
|
- :9001
|
||||||
|
profiles:
|
||||||
|
- deps
|
||||||
volumes:
|
volumes:
|
||||||
postgres-data:
|
mysql-data:
|
||||||
minio-data:
|
minio-data:
|
||||||
|
|||||||
@ -1,14 +1,9 @@
|
|||||||
spring.application.name=meals-made-easy-api
|
spring.application.name=meals-made-easy-api
|
||||||
spring.jpa.hibernate.ddl-auto=create-drop
|
spring.jpa.hibernate.ddl-auto=create-drop
|
||||||
spring.datasource.url=jdbc:postgresql://${POSTGRES_HOST:localhost}:${POSTGRES_PORT:5432}/${POSTGRES_DB:meals_made_easy_api}
|
spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:meals_made_easy_api}
|
||||||
spring.datasource.username=${POSTGRES_USER:meals-made-easy-api-user}
|
spring.datasource.username=${MYSQL_USERNAME:meals-made-easy-api-user}
|
||||||
spring.datasource.password=${POSTGRES_PASSWORD}
|
spring.datasource.password=${MYSQL_PASSWORD}
|
||||||
|
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||||
# Source - https://stackoverflow.com/questions/3164072/large-objects-may-not-be-used-in-auto-commit-mode
|
|
||||||
# Posted by Iogui, modified by community. See post 'Timeline' for change history
|
|
||||||
# Retrieved 2025-12-25, License - CC BY-SA 4.0
|
|
||||||
spring.datasource.hikari.auto-commit=false
|
|
||||||
|
|
||||||
app.mealsmadeeasy.api.baseUrl=http://localhost:8080
|
app.mealsmadeeasy.api.baseUrl=http://localhost:8080
|
||||||
app.mealsmadeeasy.api.security.access-token-lifetime=60
|
app.mealsmadeeasy.api.security.access-token-lifetime=60
|
||||||
app.mealsmadeeasy.api.security.refresh-token-lifetime=3600
|
app.mealsmadeeasy.api.security.refresh-token-lifetime=3600
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user