kou commented on code in PR #50125:
URL: https://github.com/apache/arrow/pull/50125#discussion_r3384895377
##########
ci/docker/ubuntu-22.04-cpp-minimal.dockerfile:
##########
@@ -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}
Review Comment:
We can always use `ubuntu:22.04` because this Dockerfile is only for Ubuntu
22.04.
```suggestion
FROM --platform=linux/${arch} ubuntu:22.04
```
##########
ci/docker/ubuntu-22.04-verify-rc.dockerfile:
##########
@@ -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}
Review Comment:
```suggestion
FROM --platform=linux/${arch} ubuntu:22.04
```
##########
ci/docker/ubuntu-22.04-cpp.dockerfile:
##########
@@ -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}
Review Comment:
```suggestion
FROM --platform=linux/${arch} ubuntu:22.04
```
##########
ci/docker/ubuntu-24.04-cpp-minimal.dockerfile:
##########
@@ -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}
Review Comment:
```suggestion
FROM --platform=linux/${arch} ubuntu:24.04
```
##########
compose.yaml:
##########
@@ -254,12 +254,12 @@ services:
# docker compose run --rm conda
# Parameters:
# ARCH: amd64, arm32v7
Review Comment:
```suggestion
# ARCH: amd64, arm/v7
```
##########
compose.yaml:
##########
@@ -451,15 +453,15 @@ services:
ubuntu-cpp-bundled:
# Arrow build with BUNDLED dependencies
- image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp-minimal
+ image: ${REPO}:${ARCH_SHORT}-ubuntu-${UBUNTU}-cpp-minimal
build:
context: .
dockerfile: ci/docker/ubuntu-${UBUNTU}-cpp-minimal.dockerfile
cache_from:
- - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp-minimal
+ - ${REPO}:${ARCH_SHORT}-ubuntu-${UBUNTU}-cpp-minimal
args:
arch: ${ARCH}
- base: "${ARCH}/ubuntu:${UBUNTU}"
+ base: "ubuntu:${UBUNTU}"
Review Comment:
We don't need this because `ubuntu-${UBUNTU}-cpp-minumal.dockerfile` has a
static `base`.
```suggestion
```
##########
ci/docker/ubuntu-24.04-cpp.dockerfile:
##########
@@ -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}
Review Comment:
```suggestion
FROM --platform=linux/${arch} ubuntu:24.04
```
##########
compose.yaml:
##########
@@ -910,15 +916,16 @@ services:
# Parameters:
# ARCH: amd64, arm32v7
Review Comment:
```suggestion
# ARCH: amd64, arm/v7
```
##########
ci/docker/ubuntu-24.04-verify-rc.dockerfile:
##########
@@ -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}
Review Comment:
```suggestion
FROM --platform=linux/${arch} ubuntu:24.04
```
##########
compose.yaml:
##########
@@ -274,15 +274,16 @@ services:
# docker compose run --rm conda-cpp
# Parameters:
# ARCH: amd64, arm32v7
Review Comment:
```suggestion
# ARCH: amd64, arm/v7
```
##########
compose.yaml:
##########
@@ -524,15 +526,15 @@ services:
ubuntu-cpp-minimal:
# Arrow build with minimal components/dependencies
- image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp-minimal
+ image: ${REPO}:${ARCH_SHORT}-ubuntu-${UBUNTU}-cpp-minimal
build:
context: .
dockerfile: ci/docker/ubuntu-${UBUNTU}-cpp-minimal.dockerfile
cache_from:
- - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp-minimal
+ - ${REPO}:${ARCH_SHORT}-ubuntu-${UBUNTU}-cpp-minimal
args:
arch: ${ARCH}
- base: "${ARCH}/ubuntu:${UBUNTU}"
+ base: "ubuntu:${UBUNTU}"
Review Comment:
```suggestion
```
##########
compose.yaml:
##########
@@ -309,15 +310,16 @@ services:
# docker compose run --rm conda-cpp-valgrind
# Parameters:
# ARCH: amd64, arm32v7
Review Comment:
```suggestion
# ARCH: amd64, arm/v7
```
##########
compose.yaml:
##########
@@ -473,15 +475,15 @@ services:
ubuntu-cpp-bundled-offline:
# Arrow build with BUNDLED dependencies with downloaded dependencies.
- image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp-minimal
+ image: ${REPO}:${ARCH_SHORT}-ubuntu-${UBUNTU}-cpp-minimal
build:
context: .
dockerfile: ci/docker/ubuntu-${UBUNTU}-cpp-minimal.dockerfile
cache_from:
- - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp-minimal
+ - ${REPO}:${ARCH_SHORT}-ubuntu-${UBUNTU}-cpp-minimal
args:
arch: ${ARCH}
- base: "${ARCH}/ubuntu:${UBUNTU}"
+ base: "ubuntu:${UBUNTU}"
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
