fix(Dockerfile): better integration with cli-bundler & dotnet template

aurelia · Sep 12, 2019 · 8fa9ee6 · 8fa9ee6
1 parent 1cefad4
commit 8fa9ee6
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/skeleton/docker/Dockerfile b/skeleton/docker/Dockerfile
@@ -80,6 +80,10 @@ COPY src ./src
 COPY test ./test
 // @endif
 
+// @if feat["cli-bundler"] && feat["dotnet-core"]
+COPY wwwroot ./wwwroot
+// @endif
+
 // @if feat.jest || feat.karma
 # RUN UNIT TESTS
 RUN au test
@@ -103,11 +107,15 @@ WORKDIR /usr/share/nginx/html
 COPY --from=publish /app/dist/ .
 // @endif
 
-// @if feat["dotnet-core"]
+// @if feat.webpack && feat["dotnet-core"]
 COPY --from=publish /app/wwwroot/dist/ .
 // @endif
 
-// @if feat["cli-bundler"]
+// @if feat["cli-bundler"] && feat["dotnet-core"]
+COPY --from=publish /app/wwwroot/ .
+// @endif
+
+// @if feat["cli-bundler"] && !feat["dotnet-core"]
   // @if feat["scaffold-navigation"]
 COPY --from=publish /app/bootstrap/dist/ ./bootstrap/dist/
   // @endif