fixing generate strategy

Signed-off-by: John Long <[email protected]>
EnterpriseDB · Jan 23, 2024 · b34e4d6 · b34e4d6
1 parent 9f9d663
commit b34e4d6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/generate-strategy.sh b/.github/generate-strategy.sh
@@ -103,10 +103,11 @@ for version in "${ubi_versions[@]}"; do
 
 	# Build the json entry
 	for ubiVersion in "$ubi8Version" "$ubi9Version"; do
+	  majorVersion="${ubiVersion%%.*}"
 	  entries+=(
-		  "{\"name\": \"UBI${ubiVersion} ${fullVersion}\", \"ubi_version\": \"$ubiVersion\", \"platforms\": \"$platforms\", \"dir\": \"UBI/$version\", \"file\": \"UBI/$version/Dockerfile\", \"version\": \"$version\", \"tags\": [\"$(join "\", \"" "${versionAliases[@]}")\"]}"
-		  "{\"name\": \"UBI${ubiVersion} ${fullVersion} MultiLang\", \"ubi_version\": \"$ubiVersion\", \"platforms\": \"$platforms\", \"dir\": \"UBI/$version\", \"file\": \"UBI/$version/Dockerfile.multilang\", \"version\": \"$version\", \"tags\": [\"$(join "\", \"" "${versionAliasesMultiLang[@]}")\"]}"
-		  "{\"name\": \"UBI${ubiVersion} ${fullVersion} MultiArch\", \"ubi_version\": \"$ubiVersion\", \"platforms\": \"$platformsMultiArch\", \"dir\": \"UBI/$version\", \"file\": \"UBI/$version/Dockerfile.multiarch\", \"version\": \"$version\", \"tags\": [\"$(join "\", \"" "${versionAliasesMultiArch[@]}")\"]}"
+		  "{\"name\": \"${fullVersion} UBI${majorVersion}\", \"ubi_version\": \"$ubiVersion\", \"platforms\": \"$platforms\", \"dir\": \"UBI/$version\", \"file\": \"UBI/$version/Dockerfile.ubi$majorVersion\", \"version\": \"$version\", \"tags\": [\"$(join "\", \"" "${versionAliases[@]}")\"]}"
+		  "{\"name\": \"${fullVersion} UBI${majorVersion}  MultiLang\", \"ubi_version\": \"$ubiVersion\", \"platforms\": \"$platforms\", \"dir\": \"UBI/$version\", \"file\": \"UBI/$version/Dockerfile.multilang.ubi$majorVersion\", \"version\": \"$version\", \"tags\": [\"$(join "\", \"" "${versionAliasesMultiLang[@]}")\"]}"
+		  "{\"name\": \"${fullVersion} UBI${majorVersion}  MultiArch\", \"ubi_version\": \"$ubiVersion\", \"platforms\": \"$platformsMultiArch\", \"dir\": \"UBI/$version\", \"file\": \"UBI/$version/Dockerfile.multiarch.ubi$majorVersion\", \"version\": \"$version\", \"tags\": [\"$(join "\", \"" "${versionAliasesMultiArch[@]}")\"]}"
 	  )
 	done
 done