From e5127dd413756fc416428b237e7589ba0e0f6310 Mon Sep 17 00:00:00 2001
From: Sander Saares <sander@saares.eu>
Date: Sun, 15 Dec 2019 13:30:40 +0000
Subject: [PATCH] x

---
 .github/workflows/build.yml | 12 ++++++------
 DockerExporter.csproj       |  2 +-
 Dockerfile                  |  7 +++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index da4f773..e9b0fbc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,9 +13,9 @@ jobs:
         VERSIONSTRING: ${{ steps.make_version_string.outputs.versionstring }}
       with:
         path: Constants.cs
-#    - name: Publish to Registry
-#      uses: elgohr/Publish-Docker-Github-Action@master
-#      with:
-#        name: sandersaares/test123
-#        username: sandersaares
-#        password: ${{ secrets.docker_hub_token }}
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: sandersaares/test123
+        username: sandersaares
+        password: ${{ secrets.docker_hub_token }}
diff --git a/DockerExporter.csproj b/DockerExporter.csproj
index 90cf006..b110c6d 100644
--- a/DockerExporter.csproj
+++ b/DockerExporter.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyName>DockerExporter</AssemblyName>
+    <AssemblyName>docker_exporter</AssemblyName>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
diff --git a/Dockerfile b/Dockerfile
index e097720..fb1a83c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,16 +3,15 @@ WORKDIR /app
 
 # Separate layers here to avoid redoing dependencies on code change.
 COPY *.sln .
-COPY DockerExporter/*.csproj ./DockerExporter/
+COPY *.csproj .
 RUN dotnet restore
 
 # Now the code.
-COPY DockerExporter/. ./DockerExporter/
-WORKDIR /app/DockerExporter
+COPY . .
 RUN dotnet publish -c Release -o out
 
 FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS runtime
 WORKDIR /app
-COPY --from=build /app/DockerExporter/out ./
+COPY --from=build /app/out .
 
 ENTRYPOINT ["dotnet", "DockerExporter.dll"]
\ No newline at end of file