diff --git a/docker-compose.yml b/docker-compose.yml index bbfd7b671..164e12653 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,8 +9,6 @@ version: '2' services: webmvc: image: eshop/web - links: - - identity.service:localhost depends_on: - identity.service - basket.api diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile b/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile index 2b1435a41..c945aa42a 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile @@ -4,3 +4,5 @@ ARG source=. WORKDIR /app ENV ASPNETCORE_URLS http://0.0.0.0:5104 COPY $source . + + diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Program.cs b/src/Web/WebSPA/eShopOnContainers.WebSPA/Program.cs index dc32e7ee6..40099c4e9 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Program.cs +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Program.cs @@ -10,7 +10,7 @@ namespace eShopConContainers.WebSPA { var config = new ConfigurationBuilder() .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile("hosting.json", optional: true) + //.AddJsonFile("hosting.json", optional: true) .Build(); var host = new WebHostBuilder() diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/hosting.json b/src/Web/WebSPA/eShopOnContainers.WebSPA/hosting.json deleted file mode 100644 index c42a75b13..000000000 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/hosting.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "server.urls": "http://localhost:5000;http://localhost:5001" -} \ No newline at end of file diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/package.json b/src/Web/WebSPA/eShopOnContainers.WebSPA/package.json index 05792c0cf..24c68de99 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/package.json +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/package.json @@ -95,7 +95,7 @@ "ts-node": "1.4.3", "tslint": "^3.15.1", "typedoc": "0.5.0", - "typescript": "^2.0.6", + "typescript": "2.0.6", "url-loader": "^0.5.7", "webpack": "2.1.0-beta.25", "webpack-externals-plugin": "1.0.0",