Merge branch 'master' into updatecli_4ef8049ef9f0373a94b0e3c2f88ab1e9…

…8fe34d9a1e7b1d2b5816d7420f71c3e3
jenkinsci · Jul 31, 2023 · d369006 · d369006
2 parents e208b74 + a1d2112
commit d369006
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/build-windows.yaml b/build-windows.yaml
@@ -5,6 +5,7 @@ services:
       context: ./
       dockerfile: ./windows/nanoserver/Dockerfile
       args:
+        JAVA_MAJOR_VERSION: 11
         version: ${PARENT_IMAGE_VERSION}
         WINDOWS_VERSION_TAG: ${NANOSERVER_VERSION_TAG}
   jdk17-nanoserver:
@@ -13,6 +14,7 @@ services:
       context: ./
       dockerfile: ./windows/nanoserver/Dockerfile
       args:
+        JAVA_MAJOR_VERSION: 17
         version: ${PARENT_IMAGE_VERSION}
         WINDOWS_VERSION_TAG: ${NANOSERVER_VERSION_TAG}
   jdk11-windowsservercore:
@@ -21,6 +23,7 @@ services:
       context: ./
       dockerfile: ./windows/windowsservercore/Dockerfile
       args:
+        JAVA_MAJOR_VERSION: 11
         version: ${PARENT_IMAGE_VERSION}
         WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG}
   jdk17-windowsservercore:
@@ -29,5 +32,6 @@ services:
       context: ./
       dockerfile: ./windows/windowsservercore/Dockerfile
       args:
+        JAVA_MAJOR_VERSION: 17
         version: ${PARENT_IMAGE_VERSION}
         WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG}
diff --git a/build.ps1 b/build.ps1
@@ -3,8 +3,8 @@ Param(
     [Parameter(Position=1)]
     [String] $Target = "build",
     [String] $Build = '',
+    [String] $VersionTag = 'NEXT_TAG_VERSION',
     [String] $ParentImageVersion = '3131.vf2b_b_798b_ce99-5',
-    [String] $BuildNumber = '1',
     [switch] $PushVersions = $false
 )
 
@@ -84,8 +84,8 @@ Invoke-Expression "$baseDockerCmd config --services" 2>$null | ForEach-Object {
     $windowsVersion = $items[2]
 
     $baseImage = "${windowsType}-${windowsVersion}"
-    $versionTag = "${ParentImageVersion}-${BuildNumber}-${image}"
-    $tags = @( $image, $versionTag )
+    $completeVersionTag = "${VersionTag}-${image}"
+    $tags = @( $image, $completeVersionTag )
     if($jdkMajorVersion -eq "$defaultJdk") {
         $tags += $baseImage
     }
@@ -215,15 +215,15 @@ if($target -eq "publish") {
             }
 
             if($PushVersions) {
-                $buildTag = "$ParentImageVersion-$BuildNumber-$tag"
+                $buildTag = "$VersionTag-$tag"
                 if($tag -eq 'latest') {
-                    $buildTag = "$ParentImageVersion-$BuildNumber"
+                    $buildTag = "$VersionTag"
                 }
-                Publish-Image "$Build" "${Organization}/${Repository}:${buildTag}"
+                Publish-Image "$b" "${Organization}/${Repository}:${buildTag}"
                 if($lastExitCode -ne 0) {
                     $publishFailed = 1
                 }
-            }
+            }    
         }
     } else {
         foreach($b in $builds.Keys) {
@@ -234,9 +234,9 @@ if($target -eq "publish") {
                 }
 
                 if($PushVersions) {
-                    $buildTag = "$ParentImageVersion-$BuildNumber-$tag"
+                    $buildTag = "$VersionTag-$tag"
                     if($tag -eq 'latest') {
-                        $buildTag = "$ParentImageVersion-$BuildNumber"
+                        $buildTag = "$VersionTag"
                     }
                     Publish-Image "$b" "${Organization}/${Repository}:${buildTag}"
                     if($lastExitCode -ne 0) {