Browse Source

WIP - Testing approaches

pull/1005/head
Miguel Veloso 5 years ago
parent
commit
f6c2f5672a
5 changed files with 32 additions and 16 deletions
  1. +8
    -2
      .dockerignore
  2. +3
    -0
      .gitignore
  3. +3
    -0
      Dockerfile-scripts/restore-packages
  4. +1
    -0
      restore-packages.cmd
  5. +17
    -14
      src/Services/Ordering/Ordering.API/Dockerfile

+ 8
- 2
.dockerignore View File

@ -7,7 +7,6 @@
docker-compose*.yml
docker-compose.dcproj
*.sln
!eShopOnContainers-ServicesAndWebApps.sln
*.md
hosts
LICENSE
@ -31,4 +30,11 @@ cli-linux
**/wwwroot/lib/*
global.json
**/appsettings.localhost.json
src/Web/WebSPA/wwwroot/
src/Web/WebSPA/wwwroot/
packages/
csproj-files/
test-results/
TestResults/
src/Mobile/
src/Web/Catalog.WebForms/
src/Web/WebMonolithic/

+ 3
- 0
.gitignore View File

@ -26,6 +26,9 @@ bld/
# Visual Studio 2015 cache/options directory
.vs/
# Dockerfile projects folder for restore-packages script
csproj-files/
# .js files created on build:
src/Web/WebMVC/wwwroot/js/site*


+ 3
- 0
Dockerfile-scripts/restore-packages View File

@ -0,0 +1,3 @@
#!/bin/bash
for f in *.csproj; do dotnet restore --no-dependencies ../csproj-files/$f; done

+ 1
- 0
restore-packages.cmd View File

@ -0,0 +1 @@
for /R %%f in (*.csproj) do dotnet restore --no-dependencies %%f

+ 17
- 14
src/Services/Ordering/Ordering.API/Dockerfile View File

@ -4,21 +4,24 @@ EXPOSE 80
FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
WORKDIR /src
COPY . .
WORKDIR /src/src/Services/Ordering/Ordering.API
RUN dotnet restore -nowarn:msb3202,nu1503
RUN dotnet build --no-restore -c Release -o /app
COPY **/*.csproj csproj-files/
# WORKDIR /src/Dockerfile-scripts
# RUN restore-packages
# COPY . .
# WORKDIR /src/src/Services/Ordering/Ordering.API
# RUN dotnet restore -nowarn:msb3202,nu1503
# RUN dotnet build --no-restore -c Release -o /app
FROM build as functionaltest
WORKDIR /src/src/Services/Ordering/Ordering.FunctionalTests
# FROM build as functionaltest
# WORKDIR /src/src/Services/Ordering/Ordering.FunctionalTests
FROM build as unittest
WORKDIR /src/src/Services/Ordering/Ordering.UnitTests
# FROM build as unittest
# WORKDIR /src/src/Services/Ordering/Ordering.UnitTests
FROM build AS publish
RUN dotnet publish --no-restore -c Release -o /app
# FROM build AS publish
# RUN dotnet publish --no-restore -c Release -o /app
FROM base AS final
WORKDIR /app
COPY --from=publish /app .
ENTRYPOINT ["dotnet", "Ordering.API.dll"]
# FROM base AS final
# WORKDIR /app
# COPY --from=publish /app .
# ENTRYPOINT ["dotnet", "Ordering.API.dll"]

Loading…
Cancel
Save