Skip to content

Commit b9d35c8

Browse files
CESARDELATORRECESARDELATORRE
committed
Merge branch 'vs2017' of https://github.com/dotnet/eShopOnContainers into vs2017
2 parents 439ec70 + 2052392 commit b9d35c8

7 files changed

Lines changed: 50 additions & 55 deletions

File tree

‎docker-compose.override.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ services:
3939
ports:
4040
- "5102:5102"
4141

42-
# eshoponcontainers.webspa:
43-
# environment:
44-
# - ASPNETCORE_ENVIRONMENT=Development
45-
# - CatalogUrl=http://10.0.75.1:5101
46-
# - OrderingUrl=http://10.0.75.1:5102
47-
# #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
48-
# - 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.
49-
# - BasketUrl=http://10.0.75.1:5103
50-
# ports:
51-
# - "5104:5104"
42+
eshoponcontainers.webspa:
43+
environment:
44+
- ASPNETCORE_ENVIRONMENT=Development
45+
- CatalogUrl=http://10.0.75.1:5101
46+
- OrderingUrl=http://10.0.75.1:5102
47+
#- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
48+
- 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.
49+
- BasketUrl=http://10.0.75.1:5103
50+
ports:
51+
- "5104:5104"
5252

5353
webmvc:
5454
environment:

‎docker-compose.vs.debug.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,20 @@ services:
6161
labels:
6262
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
6363

64-
# eshoponcontainers.webspa:
65-
# image: eshop/eshoponcontainers.webspa:dev
66-
# build:
67-
# args:
68-
# source: ${DOCKER_BUILD_SOURCE}
69-
# environment:
70-
# - DOTNET_USE_POLLING_FILE_WATCHER=1
71-
# volumes:
72-
# - ./src/Web/WebSPA/eShopOnContainers.WebSPA:/app
73-
# - ~/.nuget/packages:/root/.nuget/packages:ro
74-
# - ~/clrdbg:/clrdbg:ro
75-
# entrypoint: tail -f /dev/null
76-
# labels:
77-
# - "com.microsoft.visualstudio.targetoperatingsystem=linux"
64+
eshoponcontainers.webspa:
65+
image: eshop/eshoponcontainers.webspa:dev
66+
build:
67+
args:
68+
source: ${DOCKER_BUILD_SOURCE}
69+
environment:
70+
- DOTNET_USE_POLLING_FILE_WATCHER=1
71+
volumes:
72+
- ./src/Web/WebSPA/eShopOnContainers.WebSPA:/app
73+
- ~/.nuget/packages:/root/.nuget/packages:ro
74+
- ~/clrdbg:/clrdbg:ro
75+
entrypoint: tail -f /dev/null
76+
labels:
77+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
7878

7979
webmvc:
8080
image: eshop/webmvc:dev

‎docker-compose.vs.release.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ services:
4141
labels:
4242
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
4343

44-
# eshoponcontainers.webspa:
45-
# build:
46-
# args:
47-
# source: ${DOCKER_BUILD_SOURCE}
48-
# volumes:
49-
# - ~/clrdbg:/clrdbg:ro
50-
# entrypoint: tail -f /dev/null
51-
# labels:
52-
# - "com.microsoft.visualstudio.targetoperatingsystem=linux"
44+
eshoponcontainers.webspa:
45+
build:
46+
args:
47+
source: ${DOCKER_BUILD_SOURCE}
48+
volumes:
49+
- ~/clrdbg:/clrdbg:ro
50+
entrypoint: tail -f /dev/null
51+
labels:
52+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
5353

5454
webmvc:
5555
build:

‎docker-compose.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ services:
3434
depends_on:
3535
- sql.data
3636

37-
# eshoponcontainers.webspa:
38-
# image: eshop/eshoponcontainers.webspa
39-
# build:
40-
# context: ./src/Web/WebSPA/eShopOnContainers.WebSPA
41-
# dockerfile: Dockerfile
42-
# depends_on:
43-
# - identity.api
44-
# - basket.api
37+
eshoponcontainers.webspa:
38+
image: eshop/eshoponcontainers.webspa
39+
build:
40+
context: ./src/Web/WebSPA/eShopOnContainers.WebSPA
41+
dockerfile: Dockerfile
42+
depends_on:
43+
- identity.api
44+
- basket.api
4545

4646
webmvc:
4747
image: eshop/webmvc

‎src/Web/WebSPA/eShopOnContainers.WebSPA/Startup.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
5757
if (env.IsDevelopment())
5858
{
5959
app.UseDeveloperExceptionPage();
60-
61-
app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions
62-
{
63-
HotModuleReplacement = true,
64-
ConfigFile = "config/webpack.config.js"
65-
});
66-
6760
}
6861

6962
// Configure XSRF middleware, This pattern is for SPA style applications where XSRF token is added on Index page

‎src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
1212
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
1313
<DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
14+
<TypeScriptCompileOnSaveEnabled>false</TypeScriptCompileOnSaveEnabled>
15+
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
1416
</PropertyGroup>
1517

1618
<ItemGroup>

‎src/Web/WebSPA/eShopOnContainers.WebSPA/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"aspnet-webpack": "1.0.24",
5252
"bootstrap": "4.0.0-alpha.5",
5353
"core-js": "2.4.1",
54-
"file-loader": "^0.9.0",
54+
"file-loader": "0.9.0",
5555
"font-awesome": "4.6.3",
5656
"isomorphic-fetch": "2.2.1",
5757
"normalize.css": "5.0.0",
@@ -74,29 +74,29 @@
7474
"angular2-template-loader": "0.6.0",
7575
"awesome-typescript-loader": "2.2.4",
7676
"codelyzer": "1.0.0-beta.3",
77-
"copy-webpack-plugin": "^4.0.1",
77+
"copy-webpack-plugin": "4.0.1",
7878
"css": "2.2.1",
7979
"css-loader": "0.25.0",
8080
"es6-promise": "3.2.1",
8181
"es6-promise-loader": "1.0.2",
82-
"exports-loader": "^0.6.3",
82+
"exports-loader": "0.6.3",
8383
"extendify": "1.0.0",
8484
"extract-text-webpack-plugin": "2.0.0-beta.4",
8585
"file-loader": "0.9.0",
8686
"html-loader": "0.4.4",
87-
"html-webpack-plugin": "^2.24.1",
87+
"html-webpack-plugin": "2.24.1",
8888
"json-loader": "0.5.4",
8989
"node-sass": "3.9.3",
9090
"parse5": "2.1.5",
9191
"rimraf": "2.5.4",
92-
"sass-lint": "^1.10.2",
92+
"sass-lint": "1.10.2",
9393
"sass-loader": "4.0.2",
9494
"ts-helpers": "1.1.1",
9595
"ts-node": "1.4.3",
96-
"tslint": "^3.15.1",
96+
"tslint": "3.15.1",
9797
"typedoc": "0.5.0",
9898
"typescript": "2.0.6",
99-
"url-loader": "^0.5.7",
99+
"url-loader": "0.5.7",
100100
"webpack": "2.1.0-beta.25",
101101
"webpack-externals-plugin": "1.0.0",
102102
"webpack-hot-middleware": "2.13.0",

0 commit comments

Comments
 (0)