docker build works on windows

2025-06-19 18:48:15 +08:00 · 2020-01-16 21:37:51 -08:00
parent 0e6f44b342
commit 92ce87c61c
26 changed files with 4240 additions and 4240 deletions
--- a/samples/Docker-Compose/docker-compose.yaml
+++ b/samples/Docker-Compose/docker-compose.yaml
@ -1,24 +1,24 @@
-version: "3.4"
-services:
-
-  tests:
-    build:
-      context: .
-      target: builder
-    volumes:
-      - type: bind
-        source: .
-        target: /results
-    command: test --logger:trx -r /results
-
-  benchmarks:
-    build:
-      context: .
-      target: builder
-      args:
-        build_configuration: Release
-    command: run -c Release --project test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj 0 1 2 3 4
-
-  manual-test:
-    build: .
-    ports: [ "5000:80" ]
+version: "3.4"
+services:
+
+  tests:
+    build:
+      context: .
+      target: builder
+    volumes:
+      - type: bind
+        source: .
+        target: /results
+    command: test --logger:trx -r /results
+
+  benchmarks:
+    build:
+      context: .
+      target: builder
+      args:
+        build_configuration: Release
+    command: run -c Release --project test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj 0 1 2 3 4
+
+  manual-test:
+    build: .
+    ports: [ "5000:80" ]
--- a/samples/Docker/Dockerfile
+++ b/samples/Docker/Dockerfile
@ -1,48 +1,48 @@
-#This is the base image used for any ran images
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-stretch-slim AS base
-WORKDIR /app
-EXPOSE 80
-
-#This image is used to build the source for the runnable app
-#It can also be used to run other CLI commands on the project, such as packing/deploying nuget packages. Some examples:
-#Run tests: docker build --target builder -t ocelot-build . && docker run ocelot-build test --logger:trx;LogFileName=results.trx
-#Run benchmarks: docker build --target builder --build-arg build_configuration=Release -t ocelot-build . && docker run ocelot-build run -c Release --project test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj
-FROM mcr.microsoft.com/dotnet/core/sdk:2.2-stretch AS builder
-WORKDIR /build
-#First we add only the project files so that we can cache nuget packages with dotnet restore
-COPY Ocelot.sln Ocelot.sln
-COPY src/Ocelot/Ocelot.csproj src/Ocelot/Ocelot.csproj
-COPY src/Ocelot.Administration/Ocelot.Administration.csproj src/Ocelot.Administration/Ocelot.Administration.csproj
-COPY src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj
-COPY src/Ocelot.Provider.Consul/Ocelot.Provider.Consul.csproj src/Ocelot.Provider.Consul/Ocelot.Provider.Consul.csproj
-COPY src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj
-COPY src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj
-COPY src/Ocelot.Provider.Rafty/Ocelot.Provider.Rafty.csproj src/Ocelot.Provider.Rafty/Ocelot.Provider.Rafty.csproj
-COPY src/Ocelot.Tracing.Butterfly/Ocelot.Tracing.Butterfly.csproj src/Ocelot.Tracing.Butterfly/Ocelot.Tracing.Butterfly.csproj
-COPY src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj
-COPY test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
-COPY test/Ocelot.ManualTest/Ocelot.ManualTest.csproj test/Ocelot.ManualTest/Ocelot.ManualTest.csproj
-COPY test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj
-COPY test/Ocelot.UnitTests/Ocelot.UnitTests.csproj test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
-COPY test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj
-
-RUN dotnet restore
-#Now we add the rest of the source and run a complete build... --no-restore is used because nuget should be resolved at this point
-COPY codeanalysis.ruleset codeanalysis.ruleset
-COPY src src
-COPY test test
-ARG build_configuration=Debug
-RUN dotnet build --no-restore -c ${build_configuration}
-ENTRYPOINT ["dotnet"]
-
-#This is just for holding the published manual tests...
-FROM builder AS manual-test-publish
-ARG build_configuration=Debug
-RUN dotnet publish --no-build -c ${build_configuration} -o /app test/Ocelot.ManualTest
-
-#Run manual tests! This is the default run option.
-#docker build -t ocelot-manual-test . && docker run --net host ocelot-manual-test
-FROM base AS manual-test
-ENV ASPNETCORE_ENVIRONMENT=Development
-COPY --from=manual-test-publish /app .
-ENTRYPOINT ["dotnet", "Ocelot.ManualTest.dll"]
+#This is the base image used for any ran images
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-stretch-slim AS base
+WORKDIR /app
+EXPOSE 80
+
+#This image is used to build the source for the runnable app
+#It can also be used to run other CLI commands on the project, such as packing/deploying nuget packages. Some examples:
+#Run tests: docker build --target builder -t ocelot-build . && docker run ocelot-build test --logger:trx;LogFileName=results.trx
+#Run benchmarks: docker build --target builder --build-arg build_configuration=Release -t ocelot-build . && docker run ocelot-build run -c Release --project test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj
+FROM mcr.microsoft.com/dotnet/core/sdk:2.2-stretch AS builder
+WORKDIR /build
+#First we add only the project files so that we can cache nuget packages with dotnet restore
+COPY Ocelot.sln Ocelot.sln
+COPY src/Ocelot/Ocelot.csproj src/Ocelot/Ocelot.csproj
+COPY src/Ocelot.Administration/Ocelot.Administration.csproj src/Ocelot.Administration/Ocelot.Administration.csproj
+COPY src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj
+COPY src/Ocelot.Provider.Consul/Ocelot.Provider.Consul.csproj src/Ocelot.Provider.Consul/Ocelot.Provider.Consul.csproj
+COPY src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj
+COPY src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj
+COPY src/Ocelot.Provider.Rafty/Ocelot.Provider.Rafty.csproj src/Ocelot.Provider.Rafty/Ocelot.Provider.Rafty.csproj
+COPY src/Ocelot.Tracing.Butterfly/Ocelot.Tracing.Butterfly.csproj src/Ocelot.Tracing.Butterfly/Ocelot.Tracing.Butterfly.csproj
+COPY src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj
+COPY test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
+COPY test/Ocelot.ManualTest/Ocelot.ManualTest.csproj test/Ocelot.ManualTest/Ocelot.ManualTest.csproj
+COPY test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj
+COPY test/Ocelot.UnitTests/Ocelot.UnitTests.csproj test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
+COPY test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj
+
+RUN dotnet restore
+#Now we add the rest of the source and run a complete build... --no-restore is used because nuget should be resolved at this point
+COPY codeanalysis.ruleset codeanalysis.ruleset
+COPY src src
+COPY test test
+ARG build_configuration=Debug
+RUN dotnet build --no-restore -c ${build_configuration}
+ENTRYPOINT ["dotnet"]
+
+#This is just for holding the published manual tests...
+FROM builder AS manual-test-publish
+ARG build_configuration=Debug
+RUN dotnet publish --no-build -c ${build_configuration} -o /app test/Ocelot.ManualTest
+
+#Run manual tests! This is the default run option.
+#docker build -t ocelot-manual-test . && docker run --net host ocelot-manual-test
+FROM base AS manual-test
+ENV ASPNETCORE_ENVIRONMENT=Development
+COPY --from=manual-test-publish /app .
+ENTRYPOINT ["dotnet", "Ocelot.ManualTest.dll"]