Adapt to jenkinsci/jenkins#6602 by removing -preview from Java 17 t…

…ags (#1399)
jenkinsci · Jun 25, 2022 · 8ca2691 · 8ca2691
1 parent 30d9822
commit 8ca2691
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -142,9 +142,9 @@ target "alpine_jdk17" {
     PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
   }
   tags = [
-    tag(true, "alpine-jdk17-preview"),
-    tag_weekly(false, "alpine-jdk17-preview"),
-    tag_lts(false, "lts-alpine-jdk17-preview")
+    tag(true, "alpine-jdk17"),
+    tag_weekly(false, "alpine-jdk17"),
+    tag_lts(false, "lts-alpine-jdk17")
   ]
   platforms = ["linux/amd64"]
 }
@@ -202,11 +202,11 @@ target "debian_jdk17" {
     PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
   }
   tags = [
-    tag(true, "jdk17-preview"),
-    tag_weekly(false, "latest-jdk17-preview"),
-    tag_weekly(false, "jdk17-preview"),
-    tag_lts(false, "lts-jdk17-preview"),
-    tag_lts(true, "lts-jdk17-preview")
+    tag(true, "jdk17"),
+    tag_weekly(false, "latest-jdk17"),
+    tag_weekly(false, "jdk17"),
+    tag_lts(false, "lts-jdk17"),
+    tag_lts(true, "lts-jdk17")
   ]
   platforms = ["linux/amd64", "linux/arm64"]
 }
@@ -241,9 +241,9 @@ target "debian_slim_jdk17" {
     PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
   }
   tags = [
-    tag(true, "slim-jdk17-preview"),
-    tag_weekly(false, "slim-jdk17-preview"),
-    tag_lts(false, "lts-slim-jdk17-preview"),
+    tag(true, "slim-jdk17"),
+    tag_weekly(false, "slim-jdk17"),
+    tag_lts(false, "lts-slim-jdk17"),
   ]
   platforms = ["linux/amd64"]
 }