Update entry

Simplify ARG
microsoft · May 26, 2022 · 0060e70 · 0060e70
1 parent 627e245
commit 0060e70
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+-  Resolves [#4301](https://github.com/microsoft/BotFramework-WebChat/issues/4301). Updated `Dockerfile` to support secure container supply chain, by [@compulim](https://github.com/compulim) in PR [#4303](https://github.com/microsoft/BotFramework-WebChat/pull/4303)
+
 ## [4.15.2] - 2022-05-09
 
 ### Breaking changes

diff --git a/packages/test/harness/Dockerfile b/packages/test/harness/Dockerfile
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18-alpine
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18-alpine
 
 FROM $BASE_IMAGE
 

diff --git a/playground.dockerfile b/playground.dockerfile
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18-alpine
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18-alpine
 
 FROM $BASE_IMAGE
 

diff --git a/samples/07.advanced-web-chat-apps/a.upload-to-azure-storage/Dockerfile b/samples/07.advanced-web-chat-apps/a.upload-to-azure-storage/Dockerfile
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18
 
 # This container is for simplifying CI when using Azure Pipelines
 

diff --git a/samples/07.advanced-web-chat-apps/a.upload-to-azure-storage/Dockerfile-run b/samples/07.advanced-web-chat-apps/a.upload-to-azure-storage/Dockerfile-run
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18
 
 # This is the container for running the demo under Azure Web App
 FROM $BASE_IMAGE

diff --git a/samples/07.advanced-web-chat-apps/b.sso-for-enterprise/Dockerfile b/samples/07.advanced-web-chat-apps/b.sso-for-enterprise/Dockerfile
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18
 
 # This container is for simplifying CI when using Azure Pipelines
 

diff --git a/samples/07.advanced-web-chat-apps/b.sso-for-enterprise/Dockerfile-run b/samples/07.advanced-web-chat-apps/b.sso-for-enterprise/Dockerfile-run
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18
 
 # This is the container for running the demo under Azure Web App
 FROM $BASE_IMAGE

diff --git a/samples/07.advanced-web-chat-apps/c.sso-for-intranet/Dockerfile b/samples/07.advanced-web-chat-apps/c.sso-for-intranet/Dockerfile
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18
 
 # This container is for simplifying CI when using Azure Pipelines
 FROM $BASE_IMAGE

diff --git a/samples/07.advanced-web-chat-apps/c.sso-for-intranet/Dockerfile-run b/samples/07.advanced-web-chat-apps/c.sso-for-intranet/Dockerfile-run
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18
 
 # This is the container for running the demo under Azure Web App
 FROM $BASE_IMAGE

diff --git a/samples/07.advanced-web-chat-apps/d.sso-for-teams/Dockerfile b/samples/07.advanced-web-chat-apps/d.sso-for-teams/Dockerfile
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18
 
 # This container is for simplifying CI when using Azure Pipelines
 FROM $BASE_IMAGE

diff --git a/samples/07.advanced-web-chat-apps/d.sso-for-teams/Dockerfile-run b/samples/07.advanced-web-chat-apps/d.sso-for-teams/Dockerfile-run
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18
 
 # This is the container for running the demo under Azure Web App
 FROM $BASE_IMAGE

diff --git a/samples/07.advanced-web-chat-apps/e.sso-on-behalf-of-authentication/Dockerfile b/samples/07.advanced-web-chat-apps/e.sso-on-behalf-of-authentication/Dockerfile
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18
 
 # This container is for simplifying CI when using Azure Pipelines
 

diff --git a/samples/07.advanced-web-chat-apps/e.sso-on-behalf-of-authentication/Dockerfile-run b/samples/07.advanced-web-chat-apps/e.sso-on-behalf-of-authentication/Dockerfile-run
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18
 
 # This is the container for running the demo under Azure Web App
 FROM $BASE_IMAGE

diff --git a/testharness.dockerfile b/testharness.dockerfile
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18-alpine
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18-alpine
 
 FROM $BASE_IMAGE
 

diff --git a/testharness2.dockerfile b/testharness2.dockerfile
@@ -1,7 +1,5 @@
 # Setting to a different base image to secure your container supply chain.
-ARG REGISTRY=docker.io
-ARG IMAGE_VERSION=18-alpine
-ARG BASE_IMAGE=$REGISTRY/node:$IMAGE_VERSION
+ARG BASE_IMAGE=node:18-alpine
 
 FROM $BASE_IMAGE