Skip to content

Commit eecf95e

Browse files
committed
reoder target args for uniformity (distrib specific at the end)
1 parent ca969da commit eecf95e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

docker-bake.hcl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ target "alpine" {
114114
WAR_URL = war_url()
115115
COMMIT_SHA = COMMIT_SHA
116116
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
117-
ALPINE_TAG = ALPINE_FULL_TAG
118117
JAVA_VERSION = javaversion(jdk)
118+
ALPINE_TAG = ALPINE_FULL_TAG
119119
}
120120
tags = linux_tags("alpine", jdk)
121121
platforms = platforms("alpine", jdk)
@@ -135,10 +135,10 @@ target "debian" {
135135
WAR_URL = war_url()
136136
COMMIT_SHA = COMMIT_SHA
137137
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
138+
JAVA_VERSION = javaversion(jdk)
138139
DEBIAN_RELEASE_LINE = DEBIAN_RELEASE_LINE
139140
DEBIAN_VERSION = DEBIAN_VERSION
140141
DEBIAN_VARIANT = is_debian_slim(variant) ? "-slim" : ""
141-
JAVA_VERSION = javaversion(jdk)
142142
}
143143
tags = linux_tags(variant, jdk)
144144
platforms = platforms(variant, jdk)
@@ -157,9 +157,9 @@ target "rhel" {
157157
WAR_URL = war_url()
158158
COMMIT_SHA = COMMIT_SHA
159159
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
160+
JAVA_VERSION = javaversion(jdk)
160161
RHEL_TAG = RHEL_TAG
161162
RHEL_RELEASE_LINE = RHEL_RELEASE_LINE
162-
JAVA_VERSION = javaversion(jdk)
163163
}
164164
tags = linux_tags(current_rhel, jdk)
165165
platforms = platforms(current_rhel, jdk)

0 commit comments

Comments
 (0)