From 84d194df209482d8f2bd561c17179ce815cf5389 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Mon, 14 Sep 2020 12:57:48 -0500
Subject: [PATCH] =?UTF-8?q?refactor:=20=E2=99=BB=20swap=20Dockerfile=20pre?=
 =?UTF-8?q?fix=20->=20suffix=20for=20better=20intellisense?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://stackoverflow.com/questions/27409761/docker-multiple-dockerfiles-in-project#comment103950213_32108873
---
 .gitattributes                                            | 8 +++++++-
 docker-compose.directory.migrations.tests.yml             | 2 +-
 docker-compose.override.yml                               | 4 ++--
 services/.dockerignore                                    | 2 +-
 .../{Dockerfile.dev => dev.Dockerfile}                    | 0
 .../{Dockerfile.dev => dev.Dockerfile}                    | 0
 .../{Dockerfile.migrate => migrate.Dockerfile}            | 0
 web/.dockerignore                                         | 2 +-
 8 files changed, 12 insertions(+), 6 deletions(-)
 rename services/Archival/FilterLists.Archival.Api/{Dockerfile.dev => dev.Dockerfile} (100%)
 rename services/Directory/FilterLists.Directory.Api/{Dockerfile.dev => dev.Dockerfile} (100%)
 rename services/Directory/FilterLists.Directory.Api/{Dockerfile.migrate => migrate.Dockerfile} (100%)

diff --git a/.gitattributes b/.gitattributes
index f54971e20..494723167 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -336,4 +336,10 @@ Procfile          text
 *.*rc             text
 
 # Ignore files (like .npmignore or .gitignore)
-*.*ignore         text
\ No newline at end of file
+*.*ignore         text
+
+
+
+
+# FilterLists custom
+*.Dockerfile      text
\ No newline at end of file
diff --git a/docker-compose.directory.migrations.tests.yml b/docker-compose.directory.migrations.tests.yml
index 76f1b0844..9e82cb331 100644
--- a/docker-compose.directory.migrations.tests.yml
+++ b/docker-compose.directory.migrations.tests.yml
@@ -4,7 +4,7 @@ services:
   directory-migrations-tests:
     build:
       context: ./services
-      dockerfile: Directory/FilterLists.Directory.Api/Dockerfile.migrate
+      dockerfile: Directory/FilterLists.Directory.Api/migrate.Dockerfile
       target: test-migrations
     volumes:
       - directory-migrations-tests-results:/FilterLists.Directory.Infrastructure.Migrations.Tests/TestResults
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 8c1f95d5d..6b37040e5 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -13,14 +13,14 @@ services:
   archival-api:
     build:
       context: ./services
-      dockerfile: Archival/FilterLists.Archival.Api/Dockerfile.dev
+      dockerfile: Archival/FilterLists.Archival.Api/dev.Dockerfile
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
 
   directory-api:
     build:
       context: ./services
-      dockerfile: Directory/FilterLists.Directory.Api/Dockerfile.dev
+      dockerfile: Directory/FilterLists.Directory.Api/dev.Dockerfile
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
 
diff --git a/services/.dockerignore b/services/.dockerignore
index c70cb1dfb..aca88d826 100644
--- a/services/.dockerignore
+++ b/services/.dockerignore
@@ -17,7 +17,7 @@
 **/bin
 **/charts
 **/docker-compose*
-**/Dockerfile*
+**/*Dockerfile
 **/node_modules
 **/npm-debug.log
 **/obj
diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile.dev b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile
similarity index 100%
rename from services/Archival/FilterLists.Archival.Api/Dockerfile.dev
rename to services/Archival/FilterLists.Archival.Api/dev.Dockerfile
diff --git a/services/Directory/FilterLists.Directory.Api/Dockerfile.dev b/services/Directory/FilterLists.Directory.Api/dev.Dockerfile
similarity index 100%
rename from services/Directory/FilterLists.Directory.Api/Dockerfile.dev
rename to services/Directory/FilterLists.Directory.Api/dev.Dockerfile
diff --git a/services/Directory/FilterLists.Directory.Api/Dockerfile.migrate b/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile
similarity index 100%
rename from services/Directory/FilterLists.Directory.Api/Dockerfile.migrate
rename to services/Directory/FilterLists.Directory.Api/migrate.Dockerfile
diff --git a/web/.dockerignore b/web/.dockerignore
index 4e82d82a0..10372b72a 100644
--- a/web/.dockerignore
+++ b/web/.dockerignore
@@ -1,6 +1,6 @@
 **/.gitignore
 **/azure-pipelines*.yaml
 **/node_modules
-**/Dockerfile*
+**/*Dockerfile
 **/.dockerignore
 **/.env