From ca7e8dc4f44c961b327e00b597d4917463b0f3bb Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 28 Apr 2019 17:40:56 -0500 Subject: [PATCH] simplify API dockerfile --- src/FilterLists.Api/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/FilterLists.Api/Dockerfile b/src/FilterLists.Api/Dockerfile index e7570e450..62a7d3a7a 100644 --- a/src/FilterLists.Api/Dockerfile +++ b/src/FilterLists.Api/Dockerfile @@ -12,15 +12,11 @@ EXPOSE 5000 FROM mcr.microsoft.com/dotnet/core/sdk:2.2-alpine AS build # restore -COPY FilterLists.Api.sln ./ WORKDIR /src/ COPY src/FilterLists.Data/FilterLists.Data.csproj ./FilterLists.Data/ COPY src/FilterLists.Services/FilterLists.Services.csproj ./FilterLists.Services/ COPY src/FilterLists.Api/FilterLists.Api.csproj ./FilterLists.Api/ -WORKDIR /tests/ -COPY tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj ./FilterLists.Data.Tests/ -COPY tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj ./FilterLists.Services.Tests/ -WORKDIR / +WORKDIR /src/FilterLists.Api/ RUN dotnet restore # publish @@ -34,6 +30,8 @@ RUN dotnet publish -c Release -o out --no-restore # build data tests FROM build AS test-data WORKDIR /tests/FilterLists.Data.Tests/ +COPY tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj ./ +RUN dotnet restore COPY tests/FilterLists.Data.Tests/. ./ RUN dotnet build -c Release --no-restore ENTRYPOINT ["dotnet", "test"] @@ -41,6 +39,8 @@ ENTRYPOINT ["dotnet", "test"] # build services tests FROM build AS test-services WORKDIR /tests/FilterLists.Services.Tests/ +COPY tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj ./ +RUN dotnet restore COPY tests/FilterLists.Services.Tests/. ./ RUN dotnet build -c Release --no-restore ENTRYPOINT ["dotnet", "test"]