From fb60105c8806c73f031914e444f77c954ac64cd3 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Mon, 7 Sep 2020 09:32:16 -0500
Subject: [PATCH] =?UTF-8?q?fix(build):=20=F0=9F=90=9B=F0=9F=94=A8=20extrac?=
 =?UTF-8?q?t=20separate=20build=20docker-compose?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/docker/compose/issues/4047
---
 docker-compose.override.yml                 | 1 +
 docker-compose.prod.build.yml               | 5 +++++
 docker-compose.yml                          | 3 ---
 services/directory/azure-pipelines.api.yaml | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index bfcef6277..33cf7480d 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -12,6 +12,7 @@ services:
 
   directory-api:
     build:
+      context: ./services
       dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile.dev
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
diff --git a/docker-compose.prod.build.yml b/docker-compose.prod.build.yml
index b0b8e4769..a33e66ca2 100644
--- a/docker-compose.prod.build.yml
+++ b/docker-compose.prod.build.yml
@@ -4,6 +4,11 @@
 version: "3.7"
 
 services:
+  directory-api:
+    build:
+      context: ./services
+      dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile
+
   web:
     build:
       context: ./web
diff --git a/docker-compose.yml b/docker-compose.yml
index a99b778cd..2a9296c92 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,9 +14,6 @@ services:
   directory-api:
     image: ghcr.io/collinbarrett/filterlists-directory-api
     restart: always
-    build:
-      context: ./services
-      dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile
     networks:
       - reverse-proxy
       - directory
diff --git a/services/directory/azure-pipelines.api.yaml b/services/directory/azure-pipelines.api.yaml
index cd80ac2b9..2b532e9ad 100644
--- a/services/directory/azure-pipelines.api.yaml
+++ b/services/directory/azure-pipelines.api.yaml
@@ -13,6 +13,7 @@ trigger:
         services/directory/src/FilterLists.Directory.Data.Api/*,
         docker-compose.yml,
         docker-compose.prod.yml,
+        docker-compose.prod.build.yml,
       ]
 
 pr:
@@ -30,6 +31,7 @@ pr:
         services/directory/src/FilterLists.Directory.Data.Api/*,
         docker-compose.yml,
         docker-compose.prod.yml,
+        docker-compose.prod.build.yml,
       ]
 
 pool: