Refactor Docker image build and push process (#4376)

Co-authored-by: Gautam Sheth <[email protected]>
pnp · Oct 3, 2024 · 7414025 · 7414025
1 parent e79f941
commit 7414025
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/nightlyrelease.yml b/.github/workflows/nightlyrelease.yml
@@ -19,6 +19,7 @@ jobs:
         dotnet-version: | 
           6.x
           7.x
+          8.x
     - uses: actions/checkout@v4
       with:
         ref: dev
@@ -48,12 +49,12 @@ jobs:
     - name: Build an image
       run: |
         $VERSION="$(cat ./version.txt)-nightly"
-        docker build --build-arg "PNP_MODULE_VERSION=$VERSION" --build-arg "BASE_IMAGE_SUFFIX=nanoserver-ltsc2022" --build-arg "INSTALL_USER=ContainerAdministrator" --build-arg "SKIP_PUBLISHER_CHECK=True" ./docker -f ./docker/pnppowershell.dockerFile --tag "${{ secrets.DOCKER_ORG }}/powershell:$VERSION-nanoserver-ltsc2022";
+        docker build --build-arg "PNP_MODULE_VERSION=$VERSION" --build-arg "BASE_IMAGE_SUFFIX=lts-nanoserver-ltsc2022" --build-arg "INSTALL_USER=ContainerAdministrator" --build-arg "SKIP_PUBLISHER_CHECK=True" ./docker -f ./docker/pnppowershell.dockerFile --tag "${{ secrets.DOCKER_ORG }}/powershell:$VERSION-lts-nanoserver-ltsc2022";
     - name: Push the image
       run: |
         $VERSION="$(cat ./version.txt)-nightly"
         docker login -u ${{ secrets.DOCKER_USERNAME }} -p '${{ secrets.DOCKER_PASSWORD }}'
-        docker push "${{ secrets.DOCKER_ORG }}/powershell:$VERSION-nanoserver-ltsc2022"
+        docker push "${{ secrets.DOCKER_ORG }}/powershell:$VERSION-lts-nanoserver-ltsc2022"
   publish-docker-windows-2019:
     runs-on: windows-2019
     needs: [ build ]
@@ -62,12 +63,12 @@ jobs:
     - name: Build an image
       run: |
         $VERSION="$(cat ./version.txt)-nightly"
-        docker build --build-arg "PNP_MODULE_VERSION=$VERSION" --build-arg "BASE_IMAGE_SUFFIX=nanoserver-1809" --build-arg "INSTALL_USER=ContainerAdministrator" --build-arg "SKIP_PUBLISHER_CHECK=True" ./docker -f ./docker/pnppowershell.dockerFile --tag "${{ secrets.DOCKER_ORG }}/powershell:$VERSION-nanoserver-1809";
+        docker build --build-arg "PNP_MODULE_VERSION=$VERSION" --build-arg "BASE_IMAGE_SUFFIX=lts-nanoserver-1809" --build-arg "INSTALL_USER=ContainerAdministrator" --build-arg "SKIP_PUBLISHER_CHECK=True" ./docker -f ./docker/pnppowershell.dockerFile --tag "${{ secrets.DOCKER_ORG }}/powershell:$VERSION-lts-nanoserver-1809";
     - name: Push the image
       run: |
         $VERSION="$(cat ./version.txt)-nightly"
         docker login -u ${{ secrets.DOCKER_USERNAME }} -p '${{ secrets.DOCKER_PASSWORD }}'
-        docker push "${{ secrets.DOCKER_ORG }}/powershell:$VERSION-nanoserver-1809"
+        docker push "${{ secrets.DOCKER_ORG }}/powershell:$VERSION-lts-nanoserver-1809"
   publish-docker-linux:
     runs-on: ubuntu-latest
     needs: [ build ]
@@ -76,14 +77,14 @@ jobs:
     - name: Build an image
       run: |
         VERSION=$(cat ./version.txt)-nightly
-        docker build --build-arg "PNP_MODULE_VERSION=$VERSION" --build-arg "BASE_IMAGE_SUFFIX=alpine-3.17" --build-arg "INSTALL_USER=root" --build-arg "SKIP_PUBLISHER_CHECK=False" ./docker -f ./docker/pnppowershell.dockerFile --tag ${{ secrets.DOCKER_ORG }}/powershell:$VERSION-alpine-3.17;
+        docker build --build-arg "PNP_MODULE_VERSION=$VERSION" --build-arg "BASE_IMAGE_SUFFIX=lts-alpine-3.17" --build-arg "INSTALL_USER=root" --build-arg "SKIP_PUBLISHER_CHECK=False" ./docker -f ./docker/pnppowershell.dockerFile --tag ${{ secrets.DOCKER_ORG }}/powershell:$VERSION-lts-alpine-3.17;
     - name: Tag the image
       run: |
         VERSION=$(cat ./version.txt)-nightly
-        docker image tag ${{ secrets.DOCKER_ORG }}/powershell:$VERSION-alpine-3.17 ${{ secrets.DOCKER_ORG }}/powershell:nightly
+        docker image tag ${{ secrets.DOCKER_ORG }}/powershell:$VERSION-lts-alpine-3.17 ${{ secrets.DOCKER_ORG }}/powershell:nightly
     - name: Push the image
       run: |
         VERSION=$(cat ./version.txt)-nightly
         docker login -u ${{ secrets.DOCKER_USERNAME }} -p '${{ secrets.DOCKER_PASSWORD }}'
-        docker push ${{ secrets.DOCKER_ORG }}/powershell:$VERSION-alpine-3.17
+        docker push ${{ secrets.DOCKER_ORG }}/powershell:$VERSION-lts-alpine-3.17
         docker push ${{ secrets.DOCKER_ORG }}/powershell:nightly
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
       shell: pwsh
       run: |
         $securedPassword = ConvertTo-SecureString "${{ secrets.DOCKER_PASSWORD }}" -AsPlainText -Force
-        ./docker/Publish-UnpublishedImage.ps1 PnP.PowerShell ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_ORG }} powershell $securedPassword "ContainerAdministrator" $true "nanoserver-ltsc2022"
+        ./docker/Publish-UnpublishedImage.ps1 PnP.PowerShell ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_ORG }} powershell $securedPassword "ContainerAdministrator" $true "lts-nanoserver-ltsc2022"
   publish-docker-windows-2019:
     runs-on: windows-2019
     steps:
@@ -25,7 +25,7 @@ jobs:
       shell: pwsh
       run: |
         $securedPassword = ConvertTo-SecureString "${{ secrets.DOCKER_PASSWORD }}" -AsPlainText -Force
-        ./docker/Publish-UnpublishedImage.ps1 PnP.PowerShell ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_ORG }} powershell $securedPassword "ContainerAdministrator" $true "nanoserver-1809"
+        ./docker/Publish-UnpublishedImage.ps1 PnP.PowerShell ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_ORG }} powershell $securedPassword "ContainerAdministrator" $true "lts-nanoserver-1809"
   publish-docker-linux:
     runs-on: ubuntu-latest
     steps:
@@ -34,4 +34,4 @@ jobs:
       shell: pwsh
       run: |
         $securedPassword = ConvertTo-SecureString "${{ secrets.DOCKER_PASSWORD }}" -AsPlainText -Force
-        ./docker/Publish-UnpublishedImage.ps1 PnP.PowerShell ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_ORG }} powershell $securedPassword "root" $false "alpine-3.17"
+        ./docker/Publish-UnpublishedImage.ps1 PnP.PowerShell ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_ORG }} powershell $securedPassword "root" $false "lts-alpine-3.17"
diff --git a/docker/Publish-UnpublishedImage.ps1 b/docker/Publish-UnpublishedImage.ps1
@@ -1,42 +1,42 @@
 Param(
     [Parameter(Position = 0,
-    Mandatory = $true,
-    ValueFromPipeline = $false)]
+        Mandatory = $true,
+        ValueFromPipeline = $false)]
     [String]
     $PS_MODULE_NAME,
     [Parameter(Position = 1,
-    Mandatory = $true,
-    ValueFromPipeline = $false)]
+        Mandatory = $true,
+        ValueFromPipeline = $false)]
     [String]
     $DOCKER_USERNAME,
     [Parameter(Position = 2,
-    Mandatory = $true,
-    ValueFromPipeline = $false)]
+        Mandatory = $true,
+        ValueFromPipeline = $false)]
     [String]
     $DOCKER_ORG,
     [Parameter(Position = 3,
-    Mandatory = $true,
-    ValueFromPipeline = $false)]
+        Mandatory = $true,
+        ValueFromPipeline = $false)]
     [String]
     $DOCKER_IMAGE_NAME,
     [Parameter(Position = 4,
-    Mandatory = $true,
-    ValueFromPipeline = $false)]
+        Mandatory = $true,
+        ValueFromPipeline = $false)]
     [Security.SecureString]
     $DOCKER_PASSWORD,
     [Parameter(Position = 5,
-    Mandatory = $false,
-    ValueFromPipeline = $false)]
+        Mandatory = $false,
+        ValueFromPipeline = $false)]
     [String]
     $DOCKER_INSTALL_USER = "ContainerAdministrator",
     [Parameter(Position = 6,
-    Mandatory = $false,
-    ValueFromPipeline = $false)]
+        Mandatory = $false,
+        ValueFromPipeline = $false)]
     [bool]
     $SKIP_PUBLISHER_CHECK = $false,
     [Parameter(Position = 7,
-    Mandatory = $false,
-    ValueFromPipeline = $false)]
+        Mandatory = $false,
+        ValueFromPipeline = $false)]
     [String]
     $DOCKER_IMAGE_SUFFIX_ARRAY = "nanoserver-ltsc2022"
 )
@@ -56,7 +56,7 @@ $moduleVersions | % {
             $plainStringPassword = [System.Net.NetworkCredential]::new("", $DOCKER_PASSWORD).Password;
             docker login -u $DOCKER_USERNAME -p "$plainStringPassword";
             docker push $DOCKER_ORG/$DOCKER_IMAGE_NAME`:$imageVersion;
-            if ( $baseImageSuffix -eq "alpine-3.17") {
+            if ( $baseImageSuffix -eq "lts-alpine-3.17") {
                 docker image tag $DOCKER_ORG/$DOCKER_IMAGE_NAME`:$imageVersion $DOCKER_ORG/$DOCKER_IMAGE_NAME`:latest;
                 docker push $DOCKER_ORG/$DOCKER_IMAGE_NAME`:latest;
             }

diff --git a/docker/pnppowershell.dockerFile b/docker/pnppowershell.dockerFile
@@ -1,5 +1,5 @@
-ARG BASE_IMAGE_SUFFIX=alpine-3.17
-ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-7.4-$BASE_IMAGE_SUFFIX
+ARG BASE_IMAGE_SUFFIX=lts-alpine-3.17
+ARG BASE_IMAGE=mcr.microsoft.com/powershell:$BASE_IMAGE_SUFFIX
 FROM $BASE_IMAGE
 
 SHELL ["pwsh", "-command"]

diff --git a/documentation/Add-PnPAzureADGroupOwner.md b/documentation/Add-PnPAzureADGroupOwner.md
@@ -15,7 +15,7 @@ title: Add-PnPAzureADGroupOwner
 
   *  Microsoft Graph API: All of Group.ReadWrite.All, User.ReadWrite.All
 
-Adds users to the owners of an Azure Active Directory group. This can be a security, distribution or Microsoft 365 group.
+Adds users to the owners of an Azure Active Directory group. This can be a security or Microsoft 365 group. Distribution lists are not currently supported by Graph API.
 
 ## SYNTAX
 

diff --git a/documentation/Remove-PnPAzureADGroup.md b/documentation/Remove-PnPAzureADGroup.md
@@ -15,7 +15,7 @@ online version: https://pnp.github.io/powershell/cmdlets/Remove-PnPAzureADGroup.
 
   * Microsoft Graph API: Group.ReadWrite.All
 
-Removes one Azure Active Directory group. This can be a security, distribution or Microsoft 365 group.
+Removes one Azure Active Directory group. This can be a security or Microsoft 365 group. Distribution lists are not currently supported by Graph API.
 
 ## SYNTAX