From 449faa5c2561a614e83405abe3dd53cd5b290a26 Mon Sep 17 00:00:00 2001 From: William Wong Date: Thu, 26 May 2022 15:00:57 -0700 Subject: [PATCH] Simplify ARG --- packages/test/harness/Dockerfile | 4 +--- playground.dockerfile | 4 +--- .../a.upload-to-azure-storage/Dockerfile | 4 +--- .../a.upload-to-azure-storage/Dockerfile-run | 4 +--- .../07.advanced-web-chat-apps/b.sso-for-enterprise/Dockerfile | 4 +--- .../b.sso-for-enterprise/Dockerfile-run | 4 +--- .../07.advanced-web-chat-apps/c.sso-for-intranet/Dockerfile | 4 +--- .../c.sso-for-intranet/Dockerfile-run | 4 +--- samples/07.advanced-web-chat-apps/d.sso-for-teams/Dockerfile | 4 +--- .../07.advanced-web-chat-apps/d.sso-for-teams/Dockerfile-run | 4 +--- .../e.sso-on-behalf-of-authentication/Dockerfile | 4 +--- .../e.sso-on-behalf-of-authentication/Dockerfile-run | 4 +--- testharness.dockerfile | 4 +--- testharness2.dockerfile | 4 +--- 14 files changed, 14 insertions(+), 42 deletions(-) diff --git a/packages/test/harness/Dockerfile b/packages/test/harness/Dockerfile index 373c04d7ef..75cf45297e 100644 --- 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 index f703497b3c..4bc431580c 100644 --- 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 index 6fcbfc17f1..4d1c369efd 100644 --- 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 index 9168d8f6a4..4c8926d7bb 100644 --- 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 index 6a491ed8c6..14d00cd1f8 100644 --- 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 index 9168d8f6a4..4c8926d7bb 100644 --- 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 index a93fa4d83a..d219fbc763 100644 --- 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 index 9168d8f6a4..4c8926d7bb 100644 --- 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 index a93fa4d83a..d219fbc763 100644 --- 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 index 9168d8f6a4..4c8926d7bb 100644 --- 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 index 6a491ed8c6..14d00cd1f8 100644 --- 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 index 9168d8f6a4..4c8926d7bb 100644 --- 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 index 49bce695ae..19034467df 100644 --- 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 index 9756e0cbfe..2272c68fab 100644 --- 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