Skip to content

Commit 08787e6

Browse files
authored
Adding additional logging
1 parent 175297c commit 08787e6

File tree

1 file changed

+31
-8
lines changed

1 file changed

+31
-8
lines changed

docker/Publish-UnpublishedImage.ps1

+31-8
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,49 @@ Param(
4040
[String]
4141
$DOCKER_IMAGE_SUFFIX_ARRAY = "nanoserver-ltsc2022"
4242
)
43+
Write-Host "Checking for PnP PowerShell docker images... " -NoNewLine
4344
$publishedImageVersions = (Invoke-RestMethod https://registry.hub.docker.com/v2/repositories/$DOCKER_ORG/$DOCKER_IMAGE_NAME/tags?page_size=10240).results | % {
4445
$_.name
4546
}
46-
$moduleVersions = Find-Module $PS_MODULE_NAME -AllVersions;
47-
[array]::Reverse($moduleVersions);
47+
Write-Host "$($publishedImageVersions.Length) found"
48+
49+
Write-Host "Checking for PnP PowerShell versions... " -NoNewLine
50+
$moduleVersions = @(Find-Module $PS_MODULE_NAME -AllVersions)
51+
Write-Host "$($moduleVersions.Length) found"
52+
53+
[array]::Reverse($moduleVersions)
4854
$moduleVersions | % {
49-
$moduleVersion = $_.Version;
55+
$moduleVersion = $_.Version
56+
57+
Write-Host "Validating docker image for PnP PowerShell version $moduleVersion"
58+
5059
$DOCKER_IMAGE_SUFFIX_ARRAY.Split( "," ) | % {
51-
$baseImageSuffix = $_;
52-
$imageVersion = "$moduleVersion-$baseImageSuffix";
53-
Write-Host "Checking $imageVersion"
54-
if ( !( $publishedImageVersions -contains $imageVersion ) ) {
60+
$baseImageSuffix = $_
61+
$imageVersion = "$moduleVersion-$baseImageSuffix"
62+
63+
Write-Host "- Validating build $imageVersion... " -NoNewLine
64+
65+
if (!($publishedImageVersions -contains $imageVersion))
66+
{
67+
Write-Host "not found, building new docker image... " -NoNewLine
68+
5569
docker build --build-arg "PNP_MODULE_VERSION=$moduleVersion" --build-arg "BASE_IMAGE_SUFFIX=$baseImageSuffix" --build-arg "INSTALL_USER=$DOCKER_INSTALL_USER" --build-arg "SKIP_PUBLISHER_CHECK=$SKIP_PUBLISHER_CHECK" ./docker -f ./docker/pnppowershell.dockerFile --tag $DOCKER_ORG/$DOCKER_IMAGE_NAME`:$imageVersion;
5670
$plainStringPassword = [System.Net.NetworkCredential]::new("", $DOCKER_PASSWORD).Password;
5771
docker login -u $DOCKER_USERNAME -p "$plainStringPassword";
5872
docker push $DOCKER_ORG/$DOCKER_IMAGE_NAME`:$imageVersion;
59-
if ( $baseImageSuffix -eq "alpine-3.20") {
73+
if ($baseImageSuffix -eq "alpine-3.20")
74+
{
75+
Write-Host "assigning latest tag... " -NoNewLine
76+
6077
docker image tag $DOCKER_ORG/$DOCKER_IMAGE_NAME`:$imageVersion $DOCKER_ORG/$DOCKER_IMAGE_NAME`:latest;
6178
docker push $DOCKER_ORG/$DOCKER_IMAGE_NAME`:latest;
6279
}
80+
81+
Write-Host "done"
82+
}
83+
else
84+
{
85+
Write-Host "found, skipping"
6386
}
6487
}
6588
}

0 commit comments

Comments
 (0)