diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 8481650ea..31d94245c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,16 +1,8 @@ version: "3.7" -services: - web: - volumes: - - web-static:/app/wwwroot - networks: # https://github.com/collinbarrett/wp-host-on-containers/blob/master/docker-compose.nginx.yml reverse-proxy: external: name: wp-host_reverse-proxy - -volumes: - web-static: - \ No newline at end of file + \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1887df5d7..916d6c0e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,9 @@ services: - reverse-proxy volumes: - ./ops/nginx/conf.d:/etc/nginx/conf.d:ro + depends_on: + - web + - api web: image: collinbarrett/filterlists.web:latest @@ -20,6 +23,8 @@ services: target: final networks: - reverse-proxy + depends_on: + - api api: image: collinbarrett/filterlists.api:latest diff --git a/src/FilterLists.Web/Dockerfile b/src/FilterLists.Web/Dockerfile index bf7268737..ecb4aa022 100644 --- a/src/FilterLists.Web/Dockerfile +++ b/src/FilterLists.Web/Dockerfile @@ -28,4 +28,3 @@ RUN dotnet publish -c Release -o out --no-restore # run FROM runtime as final COPY --from=build /app/src/FilterLists.Web/out ./ -VOLUME /app/wwwroot