From 20076f58e162a75cc2f7550490231f17133eae59 Mon Sep 17 00:00:00 2001
From: Oliver Booth <me@olivr.me>
Date: Mon, 28 Aug 2023 01:43:26 +0100
Subject: [PATCH] fix: move Dockerfile to repo root

---
 VPLink/Dockerfile => Dockerfile | 0
 VPLink.sln                      | 2 ++
 VPLink/VPLink.csproj            | 6 ------
 docker-compose.yml              | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)
 rename VPLink/Dockerfile => Dockerfile (100%)

diff --git a/VPLink/Dockerfile b/Dockerfile
similarity index 100%
rename from VPLink/Dockerfile
rename to Dockerfile
diff --git a/VPLink.sln b/VPLink.sln
index e7479fe..7286825 100644
--- a/VPLink.sln
+++ b/VPLink.sln
@@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\FUNDING.yml = .github\FUNDING.yml
 		global.json = global.json
 		docker-compose.yml = docker-compose.yml
+		Dockerfile = Dockerfile
+		.dockerignore = .dockerignore
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{BBE9420C-B35B-48C4-AF9B-53B0ED50E46B}"
diff --git a/VPLink/VPLink.csproj b/VPLink/VPLink.csproj
index afd4b66..3b2284b 100644
--- a/VPLink/VPLink.csproj
+++ b/VPLink/VPLink.csproj
@@ -34,12 +34,6 @@
         <FileVersion>$(VersionPrefix).0</FileVersion>
     </PropertyGroup>
 
-    <ItemGroup>
-        <Content Include="..\.dockerignore">
-            <Link>.dockerignore</Link>
-        </Content>
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1"/>
         <PackageReference Include="Serilog" Version="3.0.1"/>
diff --git a/docker-compose.yml b/docker-compose.yml
index cc0142c..ff6cf15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     pull_policy: build
     build:
       context: .
-      dockerfile: VPLink/Dockerfile
+      dockerfile: Dockerfile
     volumes:
       - type: bind
         source: /var/log/vp/vplink