-
Notifications
You must be signed in to change notification settings - Fork 4.2k
GH-32994: [Dev][Archery] Fix multi-arch Docker configuration #50125
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -15,8 +15,9 @@ | |||||||
| # specific language governing permissions and limitations | ||||||||
| # under the License. | ||||||||
|
|
||||||||
| ARG base=amd64/ubuntu:22.04 | ||||||||
| FROM ${base} | ||||||||
| ARG arch=amd64 | ||||||||
| ARG base=ubuntu:22.04 | ||||||||
| FROM --platform=linux/${arch} ${base} | ||||||||
|
Comment on lines
+19
to
+20
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
|
|
||||||||
| SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||||||||
|
|
||||||||
|
|
||||||||
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -16,7 +16,8 @@ | |||||||
| # under the License. | ||||||||
|
|
||||||||
| ARG arch=amd64 | ||||||||
| FROM ${arch}/ubuntu:22.04 | ||||||||
| ARG base=ubuntu:22.04 | ||||||||
| FROM --platform=linux/${arch} ${base} | ||||||||
|
Comment on lines
+19
to
+20
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
|
|
||||||||
| ENV DEBIAN_FRONTEND=noninteractive | ||||||||
| COPY dev/release/setup-ubuntu.sh / | ||||||||
|
|
||||||||
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -15,8 +15,9 @@ | |||||||
| # specific language governing permissions and limitations | ||||||||
| # under the License. | ||||||||
|
|
||||||||
| ARG base=amd64/ubuntu:24.04 | ||||||||
| FROM ${base} | ||||||||
| ARG arch=amd64 | ||||||||
| ARG base=ubuntu:24.04 | ||||||||
| FROM --platform=linux/${arch} ${base} | ||||||||
|
Comment on lines
+19
to
+20
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
|
|
||||||||
| SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||||||||
|
|
||||||||
|
|
||||||||
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -15,8 +15,9 @@ | |||||||
| # specific language governing permissions and limitations | ||||||||
| # under the License. | ||||||||
|
|
||||||||
| ARG base=amd64/ubuntu:24.04 | ||||||||
| FROM ${base} | ||||||||
| ARG arch=amd64 | ||||||||
| ARG base=ubuntu:24.04 | ||||||||
| FROM --platform=linux/${arch} ${base} | ||||||||
|
Comment on lines
+19
to
+20
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
|
|
||||||||
| SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||||||||
|
|
||||||||
|
|
||||||||
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -16,7 +16,8 @@ | |||||||
| # under the License. | ||||||||
|
|
||||||||
| ARG arch=amd64 | ||||||||
| FROM ${arch}/ubuntu:24.04 | ||||||||
| ARG base=ubuntu:24.04 | ||||||||
| FROM --platform=linux/${arch} ${base} | ||||||||
|
Comment on lines
+19
to
+20
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
|
|
||||||||
| ENV DEBIAN_FRONTEND=noninteractive | ||||||||
| COPY dev/release/setup-ubuntu.sh / | ||||||||
|
|
||||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can always use
ubuntu:22.04because this Dockerfile is only for Ubuntu 22.04.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Our Ubuntu dockerfiles are also used for CUDA and in that case they use a different
base.