From fb9201abaee00ca40fa19a8088294bca189b4f58 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 9 Aug 2024 08:12:50 -0500 Subject: [PATCH] [CI] use key=value form for Dockerfile ENV statements (#10685) --- tests/ci_build/Dockerfile.aarch64 | 2 +- tests/ci_build/Dockerfile.clang_tidy | 4 ++-- tests/ci_build/Dockerfile.cpu | 6 +++--- tests/ci_build/Dockerfile.gpu | 6 +++--- tests/ci_build/Dockerfile.gpu_build_r_rockylinux8 | 2 +- tests/ci_build/Dockerfile.gpu_build_rockylinux8 | 2 +- tests/ci_build/Dockerfile.gpu_dev_ver | 6 +++--- tests/ci_build/Dockerfile.i386 | 2 +- tests/ci_build/Dockerfile.jvm | 2 +- tests/ci_build/Dockerfile.jvm_cross | 4 ++-- tests/ci_build/Dockerfile.jvm_gpu_build | 2 +- tests/ci_build/Dockerfile.jvm_manylinux2014_aarch64 | 2 +- tests/ci_build/Dockerfile.jvm_manylinux2014_x86_64 | 2 +- tests/ci_build/Dockerfile.manylinux2014_aarch64 | 2 +- tests/ci_build/Dockerfile.manylinux2014_x86_64 | 2 +- tests/ci_build/Dockerfile.manylinux_2_28_x86_64 | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/ci_build/Dockerfile.aarch64 b/tests/ci_build/Dockerfile.aarch64 index 66d31cfd5..8d6cfaca3 100644 --- a/tests/ci_build/Dockerfile.aarch64 +++ b/tests/ci_build/Dockerfile.aarch64 @@ -16,7 +16,7 @@ ENV PATH=/opt/miniforge/bin:$PATH ENV CC=/opt/rh/gcc-toolset-10/root/usr/bin/gcc ENV CXX=/opt/rh/gcc-toolset-10/root/usr/bin/c++ ENV CPP=/opt/rh/gcc-toolset-10/root/usr/bin/cpp -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 # Create new Conda environment COPY conda_env/aarch64_test.yml /scripts/ diff --git a/tests/ci_build/Dockerfile.clang_tidy b/tests/ci_build/Dockerfile.clang_tidy index b7cd23042..941e2a852 100644 --- a/tests/ci_build/Dockerfile.clang_tidy +++ b/tests/ci_build/Dockerfile.clang_tidy @@ -3,7 +3,7 @@ FROM nvidia/cuda:$CUDA_VERSION_ARG-devel-ubuntu22.04 ARG CUDA_VERSION_ARG # Environment -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # Install all basic requirements RUN \ @@ -26,7 +26,7 @@ RUN \ RUN \ pip3 install pyyaml -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 # Install lightweight sudo (not bound to TTY) RUN set -ex; \ diff --git a/tests/ci_build/Dockerfile.cpu b/tests/ci_build/Dockerfile.cpu index 9332aa175..c81697ff6 100644 --- a/tests/ci_build/Dockerfile.cpu +++ b/tests/ci_build/Dockerfile.cpu @@ -1,7 +1,7 @@ FROM ubuntu:22.04 # Environment -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive SHELL ["/bin/bash", "-c"] # Use Bash as shell # Install all basic requirements @@ -20,8 +20,8 @@ ENV CC=gcc-10 ENV CXX=g++-10 ENV CPP=cpp-10 -ENV GOSU_VERSION 1.10 -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/ +ENV GOSU_VERSION=1.10 +ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ # Install gRPC RUN git clone -b v1.49.1 https://github.com/grpc/grpc.git \ diff --git a/tests/ci_build/Dockerfile.gpu b/tests/ci_build/Dockerfile.gpu index 02cea8f85..f2cfe2ef9 100644 --- a/tests/ci_build/Dockerfile.gpu +++ b/tests/ci_build/Dockerfile.gpu @@ -5,7 +5,7 @@ ARG RAPIDS_VERSION_ARG ARG NCCL_VERSION_ARG # Environment -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive SHELL ["/bin/bash", "-c"] # Use Bash as shell # Install all basic requirements @@ -33,8 +33,8 @@ RUN \ mamba clean --all --yes && \ conda run --no-capture-output -n gpu_test pip install buildkite-test-collector -ENV GOSU_VERSION 1.10 -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/ +ENV GOSU_VERSION=1.10 +ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ # Install lightweight sudo (not bound to TTY) RUN set -ex; \ diff --git a/tests/ci_build/Dockerfile.gpu_build_r_rockylinux8 b/tests/ci_build/Dockerfile.gpu_build_r_rockylinux8 index e0f89347c..159e5d776 100644 --- a/tests/ci_build/Dockerfile.gpu_build_r_rockylinux8 +++ b/tests/ci_build/Dockerfile.gpu_build_r_rockylinux8 @@ -42,7 +42,7 @@ run \ wget -nv -nc https://cmake.org/files/v3.29/cmake-3.29.5-linux-x86_64.sh --no-check-certificate && \ bash cmake-3.29.5-linux-x86_64.sh --skip-license --prefix=/usr -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 # Install lightweight sudo (not bound to TTY) RUN set -ex; \ diff --git a/tests/ci_build/Dockerfile.gpu_build_rockylinux8 b/tests/ci_build/Dockerfile.gpu_build_rockylinux8 index 104266b93..5f8a5bfec 100644 --- a/tests/ci_build/Dockerfile.gpu_build_rockylinux8 +++ b/tests/ci_build/Dockerfile.gpu_build_rockylinux8 @@ -34,7 +34,7 @@ ENV CXX=/opt/rh/gcc-toolset-10/root/usr/bin/c++ ENV CPP=/opt/rh/gcc-toolset-10/root/usr/bin/cpp ENV CUDAHOSTCXX=/opt/rh/gcc-toolset-10/root/usr/bin/c++ -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 # Install RMM (Patch out -Werror) RUN git clone -b v${RAPIDS_VERSION_ARG}.00 https://github.com/rapidsai/rmm.git --recurse-submodules --depth 1 && \ diff --git a/tests/ci_build/Dockerfile.gpu_dev_ver b/tests/ci_build/Dockerfile.gpu_dev_ver index e14ec5a9f..edf1f0cf1 100644 --- a/tests/ci_build/Dockerfile.gpu_dev_ver +++ b/tests/ci_build/Dockerfile.gpu_dev_ver @@ -8,7 +8,7 @@ ARG RAPIDS_VERSION_ARG ARG NCCL_VERSION_ARG # Environment -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive SHELL ["/bin/bash", "-c"] # Use Bash as shell # Install all basic requirements @@ -36,8 +36,8 @@ RUN \ mamba clean --all --yes && \ conda run --no-capture-output -n gpu_test pip install buildkite-test-collector -ENV GOSU_VERSION 1.10 -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/ +ENV GOSU_VERSION=1.10 +ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ # Install lightweight sudo (not bound to TTY) RUN set -ex; \ diff --git a/tests/ci_build/Dockerfile.i386 b/tests/ci_build/Dockerfile.i386 index a582a5402..f128a008f 100644 --- a/tests/ci_build/Dockerfile.i386 +++ b/tests/ci_build/Dockerfile.i386 @@ -1,6 +1,6 @@ FROM i386/debian:sid -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive SHELL ["/bin/bash", "-c"] RUN \ diff --git a/tests/ci_build/Dockerfile.jvm b/tests/ci_build/Dockerfile.jvm index 1dcd0ac37..c4584747f 100644 --- a/tests/ci_build/Dockerfile.jvm +++ b/tests/ci_build/Dockerfile.jvm @@ -27,7 +27,7 @@ ENV CPP=/opt/rh/gcc-toolset-10/root/usr/bin/cpp # Install Python packages RUN pip install numpy pytest scipy scikit-learn wheel kubernetes awscli -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 # Install lightweight sudo (not bound to TTY) RUN set -ex; \ diff --git a/tests/ci_build/Dockerfile.jvm_cross b/tests/ci_build/Dockerfile.jvm_cross index 2ce2ac4a9..2f2b5b77e 100644 --- a/tests/ci_build/Dockerfile.jvm_cross +++ b/tests/ci_build/Dockerfile.jvm_cross @@ -3,7 +3,7 @@ ARG JDK_VERSION=8 ARG SPARK_VERSION=3.5.1 # Environment -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # Install all basic requirements RUN \ @@ -34,7 +34,7 @@ ENV PATH=/opt/miniforge/bin:/opt/spark/bin:/opt/maven/bin:$PATH # Install Python packages RUN pip install numpy scipy pandas scikit-learn -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 # Install lightweight sudo (not bound to TTY) RUN set -ex; \ diff --git a/tests/ci_build/Dockerfile.jvm_gpu_build b/tests/ci_build/Dockerfile.jvm_gpu_build index 14000dab2..edb5918b8 100644 --- a/tests/ci_build/Dockerfile.jvm_gpu_build +++ b/tests/ci_build/Dockerfile.jvm_gpu_build @@ -38,7 +38,7 @@ ENV CPP=/opt/rh/gcc-toolset-10/root/usr/bin/cpp # Install Python packages RUN pip install numpy pytest scipy scikit-learn wheel kubernetes awscli -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 # Install lightweight sudo (not bound to TTY) RUN set -ex; \ diff --git a/tests/ci_build/Dockerfile.jvm_manylinux2014_aarch64 b/tests/ci_build/Dockerfile.jvm_manylinux2014_aarch64 index 1442a7644..52baff43b 100644 --- a/tests/ci_build/Dockerfile.jvm_manylinux2014_aarch64 +++ b/tests/ci_build/Dockerfile.jvm_manylinux2014_aarch64 @@ -3,7 +3,7 @@ FROM quay.io/pypa/manylinux2014_aarch64 RUN yum update -y && yum install -y java-1.8.0-openjdk-devel # Install lightweight sudo (not bound to TTY) -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 RUN set -ex; \ curl -o /usr/local/bin/gosu -L "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-arm64" && \ chmod +x /usr/local/bin/gosu && \ diff --git a/tests/ci_build/Dockerfile.jvm_manylinux2014_x86_64 b/tests/ci_build/Dockerfile.jvm_manylinux2014_x86_64 index 7626e252d..578b85618 100644 --- a/tests/ci_build/Dockerfile.jvm_manylinux2014_x86_64 +++ b/tests/ci_build/Dockerfile.jvm_manylinux2014_x86_64 @@ -3,7 +3,7 @@ FROM quay.io/pypa/manylinux2014_x86_64 RUN yum update -y && yum install -y java-1.8.0-openjdk-devel ninja-build # Install lightweight sudo (not bound to TTY) -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 RUN set -ex; \ curl -o /usr/local/bin/gosu -L "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" && \ chmod +x /usr/local/bin/gosu && \ diff --git a/tests/ci_build/Dockerfile.manylinux2014_aarch64 b/tests/ci_build/Dockerfile.manylinux2014_aarch64 index 05a1590ec..9627e15c6 100644 --- a/tests/ci_build/Dockerfile.manylinux2014_aarch64 +++ b/tests/ci_build/Dockerfile.manylinux2014_aarch64 @@ -1,7 +1,7 @@ FROM quay.io/pypa/manylinux2014_aarch64 # Install lightweight sudo (not bound to TTY) -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 RUN set -ex; \ curl -o /usr/local/bin/gosu -L "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-arm64" && \ chmod +x /usr/local/bin/gosu && \ diff --git a/tests/ci_build/Dockerfile.manylinux2014_x86_64 b/tests/ci_build/Dockerfile.manylinux2014_x86_64 index 6c2150149..11beb116e 100644 --- a/tests/ci_build/Dockerfile.manylinux2014_x86_64 +++ b/tests/ci_build/Dockerfile.manylinux2014_x86_64 @@ -1,7 +1,7 @@ FROM quay.io/pypa/manylinux2014_x86_64 # Install lightweight sudo (not bound to TTY) -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 RUN set -ex; \ curl -o /usr/local/bin/gosu -L "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" && \ chmod +x /usr/local/bin/gosu && \ diff --git a/tests/ci_build/Dockerfile.manylinux_2_28_x86_64 b/tests/ci_build/Dockerfile.manylinux_2_28_x86_64 index 7d98dfa50..5e264e2f1 100644 --- a/tests/ci_build/Dockerfile.manylinux_2_28_x86_64 +++ b/tests/ci_build/Dockerfile.manylinux_2_28_x86_64 @@ -1,7 +1,7 @@ FROM quay.io/pypa/manylinux_2_28_x86_64 # Install lightweight sudo (not bound to TTY) -ENV GOSU_VERSION 1.10 +ENV GOSU_VERSION=1.10 RUN set -ex; \ curl -o /usr/local/bin/gosu -L "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" && \ chmod +x /usr/local/bin/gosu && \