Skip to content

Commit 46252c0

Browse files
committed
Ask RPM for its own arch instead of objdump hacks
This is much cleaner and should be more appropriately granular / generally reliable.
1 parent 453845e commit 46252c0

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

23/jdk/oraclelinux8/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

23/jdk/oraclelinux9/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile-linux.template

+3-3
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ ENV JAVA_VERSION {{ java_version }}
120120
if is_alpine then
121121
"apk --print-arch"
122122
elif is_oracle then
123-
"objdump=\"$(command -v objdump)\" && objdump --file-headers \"$objdump\" | awk -F '[:,]+[[:space:]]+' '$1 == \"architecture\" { print $2 }'"
123+
"rpm --query --queryformat='%{ARCH}' rpm"
124124
else
125125
"dpkg --print-architecture"
126126
end
@@ -129,13 +129,13 @@ ENV JAVA_VERSION {{ java_version }}
129129
# input is a bashbrew arch
130130
# - "amd64", "arm64v8", etc
131131
# output is a shell "case" expression for matching the output of running "get_arch_command"
132-
# - "amd64 | i386:x86-64", etc
132+
# - "i[3456]86", "aarch64", "x86_64", etc
133133
. as $bashbrewArch
134134
| if is_alpine then {
135135
amd64: "x86_64",
136136
arm64v8: "aarch64",
137137
} elif is_oracle then {
138-
amd64: "i386:x86-64",
138+
amd64: "x86_64",
139139
arm64v8: "aarch64",
140140
} else {
141141
amd64: "amd64",

0 commit comments

Comments
 (0)