diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 46fa88028..c07f0081d 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -39,16 +39,16 @@ services: ports: - "5102:5102" -# eshoponcontainers.webspa: -# environment: -# - ASPNETCORE_ENVIRONMENT=Development -# - CatalogUrl=http://10.0.75.1:5101 -# - OrderingUrl=http://10.0.75.1:5102 -# #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. -# - IdentityUrl=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. -# - BasketUrl=http://10.0.75.1:5103 -# ports: -# - "5104:5104" + eshoponcontainers.webspa: + environment: + - ASPNETCORE_ENVIRONMENT=Development + - CatalogUrl=http://10.0.75.1:5101 + - OrderingUrl=http://10.0.75.1:5102 + #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. + - IdentityUrl=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. + - BasketUrl=http://10.0.75.1:5103 + ports: + - "5104:5104" webmvc: environment: diff --git a/docker-compose.vs.debug.yml b/docker-compose.vs.debug.yml index c71c3003f..4d6571e99 100644 --- a/docker-compose.vs.debug.yml +++ b/docker-compose.vs.debug.yml @@ -61,20 +61,20 @@ services: labels: - "com.microsoft.visualstudio.targetoperatingsystem=linux" -# eshoponcontainers.webspa: -# image: eshop/eshoponcontainers.webspa:dev -# build: -# args: -# source: ${DOCKER_BUILD_SOURCE} -# environment: -# - DOTNET_USE_POLLING_FILE_WATCHER=1 -# volumes: -# - ./src/Web/WebSPA/eShopOnContainers.WebSPA:/app -# - ~/.nuget/packages:/root/.nuget/packages:ro -# - ~/clrdbg:/clrdbg:ro -# entrypoint: tail -f /dev/null -# labels: -# - "com.microsoft.visualstudio.targetoperatingsystem=linux" + eshoponcontainers.webspa: + image: eshop/eshoponcontainers.webspa:dev + build: + args: + source: ${DOCKER_BUILD_SOURCE} + environment: + - DOTNET_USE_POLLING_FILE_WATCHER=1 + volumes: + - ./src/Web/WebSPA/eShopOnContainers.WebSPA:/app + - ~/.nuget/packages:/root/.nuget/packages:ro + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" webmvc: image: eshop/webmvc:dev diff --git a/docker-compose.vs.release.yml b/docker-compose.vs.release.yml index 3b2863feb..17248ac5c 100644 --- a/docker-compose.vs.release.yml +++ b/docker-compose.vs.release.yml @@ -41,15 +41,15 @@ services: labels: - "com.microsoft.visualstudio.targetoperatingsystem=linux" -# eshoponcontainers.webspa: -# build: -# args: -# source: ${DOCKER_BUILD_SOURCE} -# volumes: -# - ~/clrdbg:/clrdbg:ro -# entrypoint: tail -f /dev/null -# labels: -# - "com.microsoft.visualstudio.targetoperatingsystem=linux" + eshoponcontainers.webspa: + build: + args: + source: ${DOCKER_BUILD_SOURCE} + volumes: + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" webmvc: build: diff --git a/docker-compose.yml b/docker-compose.yml index 6e19724bc..896663669 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,14 +34,14 @@ services: depends_on: - sql.data -# eshoponcontainers.webspa: -# image: eshop/eshoponcontainers.webspa -# build: -# context: ./src/Web/WebSPA/eShopOnContainers.WebSPA -# dockerfile: Dockerfile -# depends_on: -# - identity.api -# - basket.api + eshoponcontainers.webspa: + image: eshop/eshoponcontainers.webspa + build: + context: ./src/Web/WebSPA/eShopOnContainers.WebSPA + dockerfile: Dockerfile + depends_on: + - identity.api + - basket.api webmvc: image: eshop/webmvc diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Startup.cs b/src/Web/WebSPA/eShopOnContainers.WebSPA/Startup.cs index 907e32d49..a0f33d8b3 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Startup.cs +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Startup.cs @@ -57,13 +57,6 @@ namespace eShopConContainers.WebSPA if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions - { - HotModuleReplacement = true, - ConfigFile = "config/webpack.config.js" - }); - } // Configure XSRF middleware, This pattern is for SPA style applications where XSRF token is added on Index page diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj b/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj index a5b90c3a2..4cbee8d8e 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj @@ -11,6 +11,8 @@ 1.1.0 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 ..\..\..\..\docker-compose.dcproj + false + true diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/package.json b/src/Web/WebSPA/eShopOnContainers.WebSPA/package.json index 24c68de99..4d9b27d44 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/package.json +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/package.json @@ -51,7 +51,7 @@ "aspnet-webpack": "1.0.24", "bootstrap": "4.0.0-alpha.5", "core-js": "2.4.1", - "file-loader": "^0.9.0", + "file-loader": "0.9.0", "font-awesome": "4.6.3", "isomorphic-fetch": "2.2.1", "normalize.css": "5.0.0", @@ -74,29 +74,29 @@ "angular2-template-loader": "0.6.0", "awesome-typescript-loader": "2.2.4", "codelyzer": "1.0.0-beta.3", - "copy-webpack-plugin": "^4.0.1", + "copy-webpack-plugin": "4.0.1", "css": "2.2.1", "css-loader": "0.25.0", "es6-promise": "3.2.1", "es6-promise-loader": "1.0.2", - "exports-loader": "^0.6.3", + "exports-loader": "0.6.3", "extendify": "1.0.0", "extract-text-webpack-plugin": "2.0.0-beta.4", "file-loader": "0.9.0", "html-loader": "0.4.4", - "html-webpack-plugin": "^2.24.1", + "html-webpack-plugin": "2.24.1", "json-loader": "0.5.4", "node-sass": "3.9.3", "parse5": "2.1.5", "rimraf": "2.5.4", - "sass-lint": "^1.10.2", + "sass-lint": "1.10.2", "sass-loader": "4.0.2", "ts-helpers": "1.1.1", "ts-node": "1.4.3", - "tslint": "^3.15.1", + "tslint": "3.15.1", "typedoc": "0.5.0", "typescript": "2.0.6", - "url-loader": "^0.5.7", + "url-loader": "0.5.7", "webpack": "2.1.0-beta.25", "webpack-externals-plugin": "1.0.0", "webpack-hot-middleware": "2.13.0",