Merge branch 'Dev' of https://github.com/dotnet/eShopOnContainers.git

Author: Javier Suárez Ruiz

src/Services/Catalog/Catalog.API/Startup.cs

@@ -53,7 +53,14 @@ public void ConfigureServices(IServiceCollection services)
                 });
             });
 
-            services.AddCors();
+            services.AddCors(options =>
+            {
+                options.AddPolicy("CorsPolicy",
+                    builder => builder.AllowAnyOrigin()
+                    .AllowAnyMethod()
+                    .AllowAnyHeader()
+                    .AllowCredentials());
+            });
 
             services.AddMvc(mvcoptions =>
             {
@@ -78,7 +85,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                 .Wait();
 
             // Use frameworks
-            app.UseCors(policyBuilder => policyBuilder.AllowAnyOrigin());
+            app.UseCors("CorsPolicy");
 
             app.UseMvc();
 

src/Services/Catalog/Catalog.API/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - catalog.data
 
   catalog.data:
-    image: eshop/mssql-server-private-preview
+    image: microsoft/mssql-server-linux
     environment:
       - SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y

src/Services/Catalog/Catalog.API/settings.json

@@ -1,5 +1,5 @@
 {
-  "ConnectionString": "Server=tcp:127.0.0.1,1455;Initial Catalog=CatalogDB;User Id=sa;Password=Pass@word",
+  "ConnectionString": "Server=tcp:127.0.0.1,1433;Initial Catalog=CatalogDB;User Id=sa;Password=Pass@word",
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {

src/Web/WebMVC/docker-compose.yml

@@ -27,7 +27,7 @@ services:
       - catalog.data
 
   catalog.data:
-    image: eshop/mssql-server-private-preview
+    image: microsoft/mssql-server-linux
     environment:
       - SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
@@ -55,7 +55,7 @@ services:
       - "5432:1433"
 
   identity.data:
-    image: eshop/mssql-server-private-preview
+    image: microsoft/mssql-server-linux
     environment:
       - SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y

src/Web/WebMVC/wwwroot/css/site.css

@@ -825,6 +825,7 @@ form .col-md-4 {
     text-transform: uppercase;
 }
 
+
 .navbar-nav {
     margin-top: 10px;
     margin-bottom: 7.5px;