diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1 index 533089e..d511dd9 100644 --- a/generate/templates/Dockerfile.ps1 +++ b/generate/templates/Dockerfile.ps1 @@ -1,6 +1,15 @@ @" FROM mcr.microsoft.com/powershell:$( $VARIANT['_metadata']['base_image_tag'] ) +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + "@ @@ -17,7 +26,7 @@ RUN apk add --no-cache git } 'sops' { - @" + @" # Note: `sops` does not provide binaries for other arch other than `linux/i386` and `linux/amd64`. So `sops` might not work on other architectures. RUN wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops && chmod +x /usr/local/bin/sops @@ -34,7 +43,7 @@ RUN apk add --no-cache gnupg }elseif ( $VARIANT['_metadata']['base_image_tag'] -match '\bubuntu\b' ) { switch ($component) { 'git' { - @" + @" RUN apt-get update \ && apt-get install -y git \ && rm -rf /var/lib/apt/lists/* @@ -43,15 +52,13 @@ RUN apt-get update \ "@ } 'sops' { - - @" + @" # Note: `sops` does not provide binaries for other arch other than `linux/i386` and `linux/amd64`. So `sops` might not work on other architectures. RUN apt-get update \ && apt-get install -y wget \ && wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops && chmod +x /usr/local/bin/sops \ && rm -rf /var/lib/apt/lists/* - RUN apt-get update \ && (apt-get install -y gpg || apt-get install -y gpgv2) \ && rm -rf /var/lib/apt/lists/* diff --git a/variants/6.0.2-ubuntu-16.04-git-sops/Dockerfile b/variants/6.0.2-ubuntu-16.04-git-sops/Dockerfile index ed8ddc1..98c3461 100644 --- a/variants/6.0.2-ubuntu-16.04-git-sops/Dockerfile +++ b/variants/6.0.2-ubuntu-16.04-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:6.0.2-ubuntu-16.04 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apt-get update \ && apt-get install -y git \ && rm -rf /var/lib/apt/lists/* @@ -10,7 +19,6 @@ RUN apt-get update \ && wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops && chmod +x /usr/local/bin/sops \ && rm -rf /var/lib/apt/lists/* - RUN apt-get update \ && (apt-get install -y gpg || apt-get install -y gpgv2) \ && rm -rf /var/lib/apt/lists/* diff --git a/variants/6.0.2-ubuntu-16.04/Dockerfile b/variants/6.0.2-ubuntu-16.04/Dockerfile index 0774aef..2f6dccc 100644 --- a/variants/6.0.2-ubuntu-16.04/Dockerfile +++ b/variants/6.0.2-ubuntu-16.04/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:6.0.2-ubuntu-16.04 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + diff --git a/variants/6.1.3-alpine-3.8-git-sops/Dockerfile b/variants/6.1.3-alpine-3.8-git-sops/Dockerfile index 063b310..1214378 100644 --- a/variants/6.1.3-alpine-3.8-git-sops/Dockerfile +++ b/variants/6.1.3-alpine-3.8-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:6.1.3-alpine-3.8 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apk add --no-cache git # Note: sops does not provide binaries for other arch other than linux/i386 and linux/amd64. So sops might not work on other architectures. diff --git a/variants/6.1.3-alpine-3.8/Dockerfile b/variants/6.1.3-alpine-3.8/Dockerfile index 92a5f56..cf736dc 100644 --- a/variants/6.1.3-alpine-3.8/Dockerfile +++ b/variants/6.1.3-alpine-3.8/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:6.1.3-alpine-3.8 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + diff --git a/variants/6.1.3-ubuntu-18.04-git-sops/Dockerfile b/variants/6.1.3-ubuntu-18.04-git-sops/Dockerfile index 290cc5c..9ee60f7 100644 --- a/variants/6.1.3-ubuntu-18.04-git-sops/Dockerfile +++ b/variants/6.1.3-ubuntu-18.04-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:6.1.3-ubuntu-18.04 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apt-get update \ && apt-get install -y git \ && rm -rf /var/lib/apt/lists/* @@ -10,7 +19,6 @@ RUN apt-get update \ && wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops && chmod +x /usr/local/bin/sops \ && rm -rf /var/lib/apt/lists/* - RUN apt-get update \ && (apt-get install -y gpg || apt-get install -y gpgv2) \ && rm -rf /var/lib/apt/lists/* diff --git a/variants/6.1.3-ubuntu-18.04/Dockerfile b/variants/6.1.3-ubuntu-18.04/Dockerfile index 9db4cba..917c4bd 100644 --- a/variants/6.1.3-ubuntu-18.04/Dockerfile +++ b/variants/6.1.3-ubuntu-18.04/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:6.1.3-ubuntu-18.04 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + diff --git a/variants/6.2.4-alpine-3.8-git-sops/Dockerfile b/variants/6.2.4-alpine-3.8-git-sops/Dockerfile index 43def41..8a777d2 100644 --- a/variants/6.2.4-alpine-3.8-git-sops/Dockerfile +++ b/variants/6.2.4-alpine-3.8-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:6.2.4-alpine-3.8 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apk add --no-cache git # Note: sops does not provide binaries for other arch other than linux/i386 and linux/amd64. So sops might not work on other architectures. diff --git a/variants/6.2.4-alpine-3.8/Dockerfile b/variants/6.2.4-alpine-3.8/Dockerfile index 5709182..1f8a20e 100644 --- a/variants/6.2.4-alpine-3.8/Dockerfile +++ b/variants/6.2.4-alpine-3.8/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:6.2.4-alpine-3.8 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + diff --git a/variants/6.2.4-ubuntu-18.04-git-sops/Dockerfile b/variants/6.2.4-ubuntu-18.04-git-sops/Dockerfile index ede863b..2bf4574 100644 --- a/variants/6.2.4-ubuntu-18.04-git-sops/Dockerfile +++ b/variants/6.2.4-ubuntu-18.04-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:6.2.4-ubuntu-18.04 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apt-get update \ && apt-get install -y git \ && rm -rf /var/lib/apt/lists/* @@ -10,7 +19,6 @@ RUN apt-get update \ && wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops && chmod +x /usr/local/bin/sops \ && rm -rf /var/lib/apt/lists/* - RUN apt-get update \ && (apt-get install -y gpg || apt-get install -y gpgv2) \ && rm -rf /var/lib/apt/lists/* diff --git a/variants/6.2.4-ubuntu-18.04/Dockerfile b/variants/6.2.4-ubuntu-18.04/Dockerfile index 86708d3..a7d8842 100644 --- a/variants/6.2.4-ubuntu-18.04/Dockerfile +++ b/variants/6.2.4-ubuntu-18.04/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:6.2.4-ubuntu-18.04 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + diff --git a/variants/7.0.3-alpine-3.9-20200928-git-sops/Dockerfile b/variants/7.0.3-alpine-3.9-20200928-git-sops/Dockerfile index 4abbe94..670627e 100644 --- a/variants/7.0.3-alpine-3.9-20200928-git-sops/Dockerfile +++ b/variants/7.0.3-alpine-3.9-20200928-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:7.0.3-alpine-3.9-20200928 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apk add --no-cache git # Note: sops does not provide binaries for other arch other than linux/i386 and linux/amd64. So sops might not work on other architectures. diff --git a/variants/7.0.3-alpine-3.9-20200928/Dockerfile b/variants/7.0.3-alpine-3.9-20200928/Dockerfile index e82a471..76a4485 100644 --- a/variants/7.0.3-alpine-3.9-20200928/Dockerfile +++ b/variants/7.0.3-alpine-3.9-20200928/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:7.0.3-alpine-3.9-20200928 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + diff --git a/variants/7.0.3-ubuntu-18.04-20201027-git-sops/Dockerfile b/variants/7.0.3-ubuntu-18.04-20201027-git-sops/Dockerfile index f64960e..980e8fb 100644 --- a/variants/7.0.3-ubuntu-18.04-20201027-git-sops/Dockerfile +++ b/variants/7.0.3-ubuntu-18.04-20201027-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:7.0.3-ubuntu-18.04-20201027 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apt-get update \ && apt-get install -y git \ && rm -rf /var/lib/apt/lists/* @@ -10,7 +19,6 @@ RUN apt-get update \ && wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops && chmod +x /usr/local/bin/sops \ && rm -rf /var/lib/apt/lists/* - RUN apt-get update \ && (apt-get install -y gpg || apt-get install -y gpgv2) \ && rm -rf /var/lib/apt/lists/* diff --git a/variants/7.0.3-ubuntu-18.04-20201027/Dockerfile b/variants/7.0.3-ubuntu-18.04-20201027/Dockerfile index e13b63b..aac7bc4 100644 --- a/variants/7.0.3-ubuntu-18.04-20201027/Dockerfile +++ b/variants/7.0.3-ubuntu-18.04-20201027/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:7.0.3-ubuntu-18.04-20201027 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + diff --git a/variants/7.1.5-alpine-3.13-20211021-git-sops/Dockerfile b/variants/7.1.5-alpine-3.13-20211021-git-sops/Dockerfile index 9bdd252..6105e59 100644 --- a/variants/7.1.5-alpine-3.13-20211021-git-sops/Dockerfile +++ b/variants/7.1.5-alpine-3.13-20211021-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:7.1.5-alpine-3.13-20211021 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apk add --no-cache git # Note: sops does not provide binaries for other arch other than linux/i386 and linux/amd64. So sops might not work on other architectures. diff --git a/variants/7.1.5-alpine-3.13-20211021/Dockerfile b/variants/7.1.5-alpine-3.13-20211021/Dockerfile index 14f51d8..d055960 100644 --- a/variants/7.1.5-alpine-3.13-20211021/Dockerfile +++ b/variants/7.1.5-alpine-3.13-20211021/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:7.1.5-alpine-3.13-20211021 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + diff --git a/variants/7.1.5-ubuntu-20.04-20211021-git-sops/Dockerfile b/variants/7.1.5-ubuntu-20.04-20211021-git-sops/Dockerfile index c31664c..17f5cad 100644 --- a/variants/7.1.5-ubuntu-20.04-20211021-git-sops/Dockerfile +++ b/variants/7.1.5-ubuntu-20.04-20211021-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:7.1.5-ubuntu-20.04-20211021 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apt-get update \ && apt-get install -y git \ && rm -rf /var/lib/apt/lists/* @@ -10,7 +19,6 @@ RUN apt-get update \ && wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops && chmod +x /usr/local/bin/sops \ && rm -rf /var/lib/apt/lists/* - RUN apt-get update \ && (apt-get install -y gpg || apt-get install -y gpgv2) \ && rm -rf /var/lib/apt/lists/* diff --git a/variants/7.1.5-ubuntu-20.04-20211021/Dockerfile b/variants/7.1.5-ubuntu-20.04-20211021/Dockerfile index a14509e..2875edf 100644 --- a/variants/7.1.5-ubuntu-20.04-20211021/Dockerfile +++ b/variants/7.1.5-ubuntu-20.04-20211021/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:7.1.5-ubuntu-20.04-20211021 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + diff --git a/variants/7.2.0-alpine-3.14-20211102-git-sops/Dockerfile b/variants/7.2.0-alpine-3.14-20211102-git-sops/Dockerfile index 249bc5f..a6d9f20 100644 --- a/variants/7.2.0-alpine-3.14-20211102-git-sops/Dockerfile +++ b/variants/7.2.0-alpine-3.14-20211102-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:7.2.0-alpine-3.14-20211102 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apk add --no-cache git # Note: sops does not provide binaries for other arch other than linux/i386 and linux/amd64. So sops might not work on other architectures. diff --git a/variants/7.2.0-alpine-3.14-20211102/Dockerfile b/variants/7.2.0-alpine-3.14-20211102/Dockerfile index a7e25c2..0dc43fc 100644 --- a/variants/7.2.0-alpine-3.14-20211102/Dockerfile +++ b/variants/7.2.0-alpine-3.14-20211102/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:7.2.0-alpine-3.14-20211102 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + diff --git a/variants/7.2.0-ubuntu-20.04-20211102-git-sops/Dockerfile b/variants/7.2.0-ubuntu-20.04-20211102-git-sops/Dockerfile index 3b20401..10ea326 100644 --- a/variants/7.2.0-ubuntu-20.04-20211102-git-sops/Dockerfile +++ b/variants/7.2.0-ubuntu-20.04-20211102-git-sops/Dockerfile @@ -1,5 +1,14 @@ FROM mcr.microsoft.com/powershell:7.2.0-ubuntu-20.04-20211102 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + RUN apt-get update \ && apt-get install -y git \ && rm -rf /var/lib/apt/lists/* @@ -10,7 +19,6 @@ RUN apt-get update \ && wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops && chmod +x /usr/local/bin/sops \ && rm -rf /var/lib/apt/lists/* - RUN apt-get update \ && (apt-get install -y gpg || apt-get install -y gpgv2) \ && rm -rf /var/lib/apt/lists/* diff --git a/variants/7.2.0-ubuntu-20.04-20211102/Dockerfile b/variants/7.2.0-ubuntu-20.04-20211102/Dockerfile index 2d136ab..4ce3ebd 100644 --- a/variants/7.2.0-ubuntu-20.04-20211102/Dockerfile +++ b/variants/7.2.0-ubuntu-20.04-20211102/Dockerfile @@ -1,2 +1,11 @@ FROM mcr.microsoft.com/powershell:7.2.0-ubuntu-20.04-20211102 +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 +