diff --git a/docker-compose.prod.build.yml b/docker-compose.prod.build.yml new file mode 100644 index 000000000..b0b8e4769 --- /dev/null +++ b/docker-compose.prod.build.yml @@ -0,0 +1,9 @@ +# overrides for production build +# https://github.com/docker/compose/issues/4047 + +version: "3.7" + +services: + web: + build: + context: ./web diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 3d4cc5fd7..ff960b58b 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -15,8 +15,6 @@ services: web: image: ghcr.io/collinbarrett/filterlists-web restart: always - build: - context: ./web networks: - reverse-proxy depends_on: diff --git a/web/azure-pipelines.yaml b/web/azure-pipelines.yaml index 5d1033b49..f828862b0 100644 --- a/web/azure-pipelines.yaml +++ b/web/azure-pipelines.yaml @@ -3,14 +3,26 @@ trigger: branches: include: [master] paths: - include: [web/*, docker-compose.yml, docker-compose.prod.yml] + include: + [ + web/*, + docker-compose.yml, + docker-compose.prod.yml, + docker-compose.prod.build.yml, + ] pr: autoCancel: false branches: include: [master] paths: - include: [web/*, docker-compose.yml, docker-compose.prod.yml] + include: + [ + web/*, + docker-compose.yml, + docker-compose.prod.yml, + docker-compose.prod.build.yml, + ] pool: vmImage: ubuntu-latest