Merge pull request MicrosoftDocs#10 from PhilStollery/container-updates

Container updates
jorgearteiro · Mar 8, 2024 · 46fb04f · 46fb04f
2 parents 19e4983 + d8298e8
commit 46fb04f
Show file tree

Hide file tree

Showing 36 changed files with 34 additions and 277 deletions.
diff --git a/dotnet-compliance/docker-compose.yml b/dotnet-compliance/docker-compose.yml
@@ -3,21 +3,14 @@ version: '3.4'
 services: 
 
   frontend:
-    image: storeimage
-    build:
-      context: .
-      dockerfile: ./eShopLite/Store/Dockerfile
+    image: store:latest
     environment: 
       - ProductEndpoint=http://backend:8080
-      - ImagePrefix=http://localhost:32001
     ports:
       - "32000:8080"
     depends_on: 
       - backend
   backend:
-    image: productservice
-    build: 
-      context: .
-      dockerfile: ./eShopLite/Products/Dockerfile
+    image: products:latest
     ports: 
-      - "32001:8080"
+      - "32001:8080"
diff --git a/dotnet-compliance/eShopLite/Products/Dockerfile b/dotnet-compliance/eShopLite/Products/Dockerfile
diff --git a/dotnet-compliance/eShopLite/Products/appsettings.json b/dotnet-compliance/eShopLite/Products/appsettings.json
@@ -7,6 +7,6 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "ProductsContext": "Data Source=Database.db"
+    "ProductsContext": "Data Source=/home/app/Database.db"
   }
 }
diff --git a/dotnet-compliance/eShopLite/Store/Components/Pages/Products.razor b/dotnet-compliance/eShopLite/Store/Components/Pages/Products.razor
@@ -41,7 +41,7 @@ else
     @foreach (var product in products)
       {
         <tr>
-          <td><img height="80" width="80" src="@imagePrefix/@product.ImageUrl" /></td>
+          <td><img height="80" width="80" src="https://raw.githubusercontent.com/MicrosoftDocs/mslearn-dotnet-cloudnative/main/dotnet-docker/Products/wwwroot/images/@product.ImageUrl" /></td>
           <td>@product.Name</td>
           <td>@product.Description</td>
           <td>@product.Price</td>
@@ -63,7 +63,6 @@ else
   private bool visible = false;
   private int selectedProductID;
   private List<Product>? products;
-  private string imagePrefix = string.Empty;
 
   private Order order = new Order { Products = new List<Product>() };
 
@@ -96,7 +95,6 @@ else
 
   protected override async Task OnInitializedAsync()
   {
-    imagePrefix = Configuration["ImagePrefix"]!;
     products = await ProductService.GetProducts();
   }
 

diff --git a/dotnet-compliance/eShopLite/Store/Dockerfile b/dotnet-compliance/eShopLite/Store/Dockerfile
diff --git a/dotnet-compliance/eShopLite/Store/appsettings.json b/dotnet-compliance/eShopLite/Store/appsettings.json
@@ -8,6 +8,5 @@
   },
   "AllowedHosts": "*",
   "ProductEndpoint": "http://localhost:32001",
-  "ProductEndpointHttps": "https://localhost:32001",
-  "ImagePrefix": "http://localhost:32001/images"
+  "ProductEndpointHttps": "https://localhost:32001"
 }
diff --git a/dotnet-docker/Products/Dockerfile b/dotnet-docker/Products/Dockerfile
diff --git a/dotnet-docker/Store/Components/Pages/Products.razor b/dotnet-docker/Store/Components/Pages/Products.razor
@@ -30,7 +30,8 @@ else
             @foreach (var product in products)
             {
                 <tr>
-                    <td><img height="80" width="80" src="@imagePrefix/@product.ImageUrl" /></td>
+                    <!-- Simulating images being hosted on a CDN -->
+                    <td><img height="80" width="80" src="https://raw.githubusercontent.com/MicrosoftDocs/mslearn-dotnet-cloudnative/main/dotnet-docker/Products/wwwroot/images/@product.ImageUrl" /></td>
                     <td>@product.Name</td>
                     <td>@product.Description</td>
                     <td>@product.Price</td>
@@ -42,13 +43,11 @@ else
 
 @code {
     private List<Product>? products;
-    private string imagePrefix = string.Empty;
 
     protected override async Task OnInitializedAsync()
     {
         // Simulate asynchronous loading to demonstrate streaming rendering
         await Task.Delay(500);
-        imagePrefix = Configuration["ImagePrefix"]!;
         products = await ProductService.GetProducts();
     }
 

diff --git a/dotnet-docker/Store/Dockerfile b/dotnet-docker/Store/Dockerfile
diff --git a/dotnet-docker/Store/appsettings.json b/dotnet-docker/Store/appsettings.json
@@ -8,6 +8,5 @@
   },
   "AllowedHosts": "*",
   "ProductEndpoint": "http://orange-fishstick-5444qv4jxq5h77qp-32001.app.github.dev",
-  "ProductEndpointHttps": "https://orange-fishstick-5444qv4jxq5h77qp-32001.app.github.dev/",
-  "ImagePrefix": "http://orange-fishstick-5444qv4jxq5h77qp-32001.app.github.dev/images"
+  "ProductEndpointHttps": "https://orange-fishstick-5444qv4jxq5h77qp-32001.app.github.dev/"
 }
diff --git a/dotnet-docker/finished-files/docker-compose.yml b/dotnet-docker/finished-files/docker-compose.yml
@@ -3,21 +3,14 @@ version: '3.4'
 services: 
 
   frontend:
-    image: storeimage
-    build:
-      context: .
-      dockerfile: ./Store/Dockerfile
+    image: store:latest
     environment: 
       - ProductEndpoint=http://backend:8080
-      - ImagePrefix=http://localhost/images
     ports:
       - "32000:8080"
     depends_on: 
       - backend
   backend:
-    image: productservice
-    build: 
-      context: .
-      dockerfile: ./Products/Dockerfile
+    image: products:latest
     ports: 
       - "32001:8080"
diff --git a/dotnet-feature-flags/DockerfileProducts b/dotnet-feature-flags/DockerfileProducts
diff --git a/dotnet-feature-flags/DockerfileStore b/dotnet-feature-flags/DockerfileStore
diff --git a/dotnet-feature-flags/Products/appsettings.json b/dotnet-feature-flags/Products/appsettings.json
@@ -7,6 +7,6 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "ProductsContext": "Data Source=Database.db"
+    "ProductsContext": "Data Source=/home/app/Database.db"
   }
 }
diff --git a/dotnet-feature-flags/Store/Components/Pages/Products.razor b/dotnet-feature-flags/Store/Components/Pages/Products.razor
@@ -37,7 +37,7 @@ else
             @foreach (var product in products)
             {
                 <tr>
-                    <td><img height="80" width="80" src="@imagePrefix/@product.ImageUrl" /></td>
+                    <td><img height="80" width="80" src="https://raw.githubusercontent.com/MicrosoftDocs/mslearn-dotnet-cloudnative/main/dotnet-docker/Products/wwwroot/images/@product.ImageUrl" /></td>
                     <td>@product.Name</td>
                     <td>@product.Description</td>
                     <td>@product.Price </td>
@@ -49,13 +49,11 @@ else
 
 @code {
     private List<Product>? products;
-    private string imagePrefix = string.Empty;
 
     protected override async Task OnInitializedAsync()
     {
         // Simulate asynchronous loading to demonstrate streaming rendering
         await Task.Delay(500);
-        imagePrefix = Configuration["ImagePrefix"];
         products = await ProductService.GetProducts();
     }
 

diff --git a/dotnet-feature-flags/Store/appsettings.json b/dotnet-feature-flags/Store/appsettings.json
@@ -9,6 +9,5 @@
   "AllowedHosts": "*",
   "ProductEndpoint": "http://localhost:32001",
   "ProductEndpointHttps": "https://localhost:32001",
-  "ImagePrefix": "http://localhost:32001/images",
   "ConnectionStrings:AppConfig": "[PASTE IN YOUR CREDENTIALS HERE]"
 }
diff --git a/dotnet-feature-flags/docker-compose.yml b/dotnet-feature-flags/docker-compose.yml
@@ -3,22 +3,15 @@ version: '3.4'
 services: 
 
   frontend:
-    image: storeimage
-    build:
-      context: .
-      dockerfile: DockerfileStore
+    image: store:latest
     environment: 
       - ProductEndpoint=http://backend:8080
-      - ImagePrefix=http://localhost:32001/images
       - ConnectionStrings:AppConfig=[PASTE CONNECTION STRING HERE]
     ports:
       - "32000:8080"
     depends_on: 
       - backend
   backend:
-    image: productservice
-    build: 
-      context: .
-      dockerfile: DockerfileProducts
+    image: products:latest
     ports: 
-      - "32001:8080"
+      - "32001:8080"
diff --git a/dotnet-kubernetes/DockerfileProducts b/dotnet-kubernetes/DockerfileProducts
diff --git a/dotnet-kubernetes/DockerfileStore b/dotnet-kubernetes/DockerfileStore
diff --git a/dotnet-kubernetes/Products/appsettings.json b/dotnet-kubernetes/Products/appsettings.json
@@ -7,6 +7,6 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "ProductsContext": "Data Source=Database.db"
+    "ProductsContext": "Data Source=/home/app/Database.db"
   }
 }
diff --git a/dotnet-kubernetes/Store/Components/Pages/Products.razor b/dotnet-kubernetes/Store/Components/Pages/Products.razor
@@ -30,7 +30,7 @@ else
             @foreach (var product in products)
             {
                 <tr>
-                    <td><img height="80" width="80" src="@imagePrefix/@product.ImageUrl" /></td>
+                    <td><img height="80" width="80" src="https://raw.githubusercontent.com/MicrosoftDocs/mslearn-dotnet-cloudnative/main/dotnet-docker/Products/wwwroot/images/@product.ImageUrl" /></td>
                     <td>@product.Name</td>
                     <td>@product.Description</td>
                     <td>@product.Price</td>
@@ -42,13 +42,11 @@ else
 
 @code {
     private List<Product>? products;
-    private string imagePrefix = string.Empty;
 
     protected override async Task OnInitializedAsync()
     {
         // Simulate asynchronous loading to demonstrate streaming rendering
         await Task.Delay(500);
-        imagePrefix = Configuration["ImagePrefix"];
         products = await ProductService.GetProducts();
     }
 

diff --git a/dotnet-kubernetes/Store/appsettings.json b/dotnet-kubernetes/Store/appsettings.json
@@ -8,6 +8,5 @@
   },
   "AllowedHosts": "*",
   "ProductEndpoint": "http://localhost:32001",
-  "ProductEndpointHttps": "https://localhost:32001",
-  "ImagePrefix": "http://localhost:32001/images"
+  "ProductEndpointHttps": "https://localhost:32001"
 }