From 3824c721913ddcf3b41a93d69ff13b85d3fe5efd Mon Sep 17 00:00:00 2001 From: James Chapman Date: Fri, 11 Aug 2023 19:58:32 +0100 Subject: [PATCH] Change to use new build output path --- .dockerignore | 3 +-- .gitignore | 3 +-- Directory.Build.props | 5 +++++ Dockerfile | 2 ++ Groceries.sln | 1 + 5 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 Directory.Build.props diff --git a/.dockerignore b/.dockerignore index 9fd8b0a..03285c0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,8 +2,7 @@ .github/ .vs/ .vscode/ -**/bin/ -**/obj/ +artifacts/ *.csproj.user Groceries/wwwroot/lib/ diff --git a/.gitignore b/.gitignore index 3fd5c89..07b0ce0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .vs/ -**/bin/ -**/obj/ +artifacts/ *.csproj.user Groceries/wwwroot/lib/ diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..5cda900 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,5 @@ + + + true + + diff --git a/Dockerfile b/Dockerfile index e4848c9..304ca6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,8 @@ COPY ./.config ./ RUN dotnet tool restore COPY ./Groceries.sln ./ +COPY ./Directory.Build.props ./ + COPY */*.csproj ./ RUN for file in $(ls *.csproj); do mkdir -p ${file%.*} && mv $file ${file%.*}; done RUN dotnet restore diff --git a/Groceries.sln b/Groceries.sln index c52ad4a..aab3cee 100644 --- a/Groceries.sln +++ b/Groceries.sln @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .dockerignore = .dockerignore .editorconfig = .editorconfig .gitignore = .gitignore + Directory.Build.props = Directory.Build.props Dockerfile = Dockerfile README.md = README.md EndProjectSection