diff --git a/docker-compose.yml b/docker-compose.yml index 43a2032..eed407a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,6 @@ services: - .env environment: SPRING_PROFILES_ACTIVE: dev - MEDIA_DATA: /app/data/media volumes: - ${MEDIA_DATA}:/app/data/media ports: @@ -55,4 +54,6 @@ services: volumes: - ${STREAM_DATA}:/stream pull_policy: build - restart: unless-stopped \ No newline at end of file + restart: unless-stopped + depends_on: + - backend \ No newline at end of file diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index e76e4fd..f9ba019 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,3 +1,5 @@ +spring.docker.compose.enabled=false + spring.datasource.url=jdbc:postgresql://postgres:5432/vodSystem spring.datasource.username=${POSTGRES_USER} spring.datasource.password=${POSTGRES_PASSWORD} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 228cf73..c5811af 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=vodSystem -spring.profiles.active=local +spring.profiles.default=local # VODs spring.servlet.multipart.max-file-size=2GB