Bringing over Docker container definitions

Author: KoenZomers

docker/linux-amd64.dockerfile

@@ -1,9 +1,6 @@
 # --platform linux/amd64
 FROM debian:bullseye-slim
 
-# Define build argument for the module version
-ARG PNP_VERSION=""
-
 # Install dependencies
 RUN apt-get update && apt-get install -y curl libicu67 libssl1.1 libunwind8
 
@@ -16,6 +13,8 @@ RUN curl -L -o powershell.tar.gz https://github.com/PowerShell/PowerShell/releas
     && ln -s /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh
 
 # Install PnP.PowerShell module
-RUN pwsh -Command "Install-Module -Name PnP.PowerShell -RequiredVersion $env:PNP_VERSION -Force -Scope AllUsers -AllowPrerelease -SkipPublisherCheck"
+SHELL ["pwsh", "-command"]
+ARG PNP_VERSION
+RUN Install-Module -Name PnP.PowerShell -RequiredVersion $env:PNP_VERSION -Force -Scope AllUsers -AllowPrerelease -SkipPublisherCheck
 
 ENTRYPOINT ["pwsh"]

docker/linux-arm64.dockerfile

@@ -1,9 +1,6 @@
 # --platform linux/arm64/v8
 FROM debian:bullseye-slim
 
-# Define build argument for the module version
-ARG PNP_VERSION=""
-
 # Install dependencies
 RUN apt-get update && apt-get install -y curl libicu67 libssl1.1 libunwind8
 
@@ -16,6 +13,8 @@ RUN curl -L -o powershell.tar.gz https://github.com/PowerShell/PowerShell/releas
     && ln -s /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh
 
 # Install PnP.PowerShell module
-RUN pwsh -Command "Install-Module -Name PnP.PowerShell -RequiredVersion $env:PNP_VERSION -Force -Scope AllUsers -AllowPrerelease -SkipPublisherCheck"
+SHELL ["pwsh", "-command"]
+ARG PNP_VERSION
+RUN Install-Module -Name PnP.PowerShell -RequiredVersion $env:PNP_VERSION -Force -Scope AllUsers -AllowPrerelease -SkipPublisherCheck
 
 ENTRYPOINT ["pwsh"]

docker/windows-amd64.dockerfile

@@ -1,8 +1,5 @@
 FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
-# Define build argument for the module version
-ARG PNP_VERSION=""
-
 RUN mkdir C:\\pwsh
 WORKDIR C:\\pwsh
 
@@ -14,8 +11,11 @@ RUN del pwsh.zip
 # Add PowerShell to PATH
 ENV PATH="C:\\pwsh;${PATH}"
 
-# Install PnP PowerShell module
-RUN pwsh -Command "Install-Module -Name PnP.PowerShell -RequiredVersion $env:PNP_VERSION -Force -Scope CurrentUser"
+# Install PnP.PowerShell module
+SHELL ["pwsh", "-command"]
+ARG PNP_VERSION
+USER ContainerAdministrator
+RUN Install-Module -Name PnP.PowerShell -RequiredVersion $env:PNP_VERSION -Force -Scope AllUsers -AllowPrerelease -SkipPublisherCheck
 
 # Start PowerShell
 CMD ["pwsh"]