Skip to content

Commit 0d8e1fb

Browse files
trivialfistrivialfis
authored
Bump maven version, freeze CUDA packages. (#92)
1 parent 65a33d1 commit 0d8e1fb

16 files changed

Lines changed: 142 additions & 84 deletions

‎containers/dockerfile/Dockerfile.clang_tidy‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ ARG CUDA_VERSION
55
ENV DEBIAN_FRONTEND=noninteractive
66
ENV GOSU_VERSION=1.10
77

8+
COPY scripts/install_gosu.sh /scripts/
9+
810
RUN \
911
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub && \
1012
apt-get update && \
@@ -29,10 +31,7 @@ RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-
2931
RUN pip3 install cmake
3032

3133
# Install lightweight sudo (not bound to TTY)
32-
RUN set -ex; \
33-
wget -nv -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" && \
34-
chmod +x /usr/local/bin/gosu && \
35-
gosu nobody true
34+
RUN sh /scripts/install_gosu.sh
3635

3736
# Default entry-point to use if running locally
3837
# It will preserve attributes of created files

‎containers/dockerfile/Dockerfile.cpu‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ENV CPP=cpp-10
1212
ENV GOSU_VERSION=1.10
1313
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
1414

15+
COPY scripts/install_gosu.sh /scripts/
16+
1517
# Install all basic requirements
1618
RUN \
1719
sed -i 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
@@ -47,11 +49,7 @@ RUN mamba create -n linux_cpu_test && \
4749
mamba clean --all --yes
4850

4951
# Install lightweight sudo (not bound to TTY)
50-
RUN set -ex; \
51-
{ [ $ARCH = "aarch64" ] && export GOSU_ARCH="arm64" || export GOSU_ARCH="amd64"; } && \
52-
wget -nv -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-${GOSU_ARCH}" && \
53-
chmod +x /usr/local/bin/gosu && \
54-
gosu nobody true
52+
RUN sh /scripts/install_gosu.sh
5553

5654
# Default entry-point to use if running locally
5755
# It will preserve attributes of created files

‎containers/dockerfile/Dockerfile.cpu_build_r_doc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ RUN \
2727

2828
ENV GOSU_VERSION=1.10
2929

30+
COPY scripts/install_gosu.sh /scripts/
31+
3032
# Install lightweight sudo (not bound to TTY)
31-
RUN set -ex; \
32-
wget -nv -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" && \
33-
chmod +x /usr/local/bin/gosu && \
34-
gosu nobody true
33+
RUN sh /scripts/install_gosu.sh
3534

3635
# Default entry-point to use if running locally
3736
# It will preserve attributes of created files

‎containers/dockerfile/Dockerfile.gpu‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ ENV PATH=/opt/miniforge/bin:$PATH
1515
ENV GOSU_VERSION=1.10
1616
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
1717

18+
COPY scripts/install_gosu.sh /scripts/
19+
1820
# Install all basic requirements
1921
RUN \
2022
{ [ $ARCH = "aarch64" ] && export CUDA_REPO_ARCH="sbsa" || export CUDA_REPO_ARCH="x86_64"; } && \
@@ -48,11 +50,7 @@ RUN \
4850
mamba clean --all --yes
4951

5052
# Install lightweight sudo (not bound to TTY)
51-
RUN set -ex; \
52-
{ [ $ARCH = "aarch64" ] && export GOSU_ARCH="arm64" || export GOSU_ARCH="amd64"; } && \
53-
wget -nv -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-${GOSU_ARCH}" && \
54-
chmod +x /usr/local/bin/gosu && \
55-
gosu nobody true
53+
RUN sh /scripts/install_gosu.sh
5654

5755
# Default entry-point to use if running locally
5856
# It will preserve attributes of created files

‎containers/dockerfile/Dockerfile.gpu_build_cuda13_rockylinux8‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@ ENV CPP=/opt/rh/gcc-toolset-10/root/usr/bin/cpp
1515
ENV CUDAHOSTCXX=/opt/rh/gcc-toolset-10/root/usr/bin/c++
1616
ENV GOSU_VERSION=1.10
1717

18+
COPY scripts/setup_cuda_rockylinux.sh scripts/install_gosu.sh /scripts/
19+
1820
# Install all basic requirements
1921
RUN \
20-
{ [ $ARCH = "aarch64" ] && export CUDA_REPO_ARCH="sbsa" || export CUDA_REPO_ARCH="x86_64"; } && \
21-
curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/rhel8/${CUDA_REPO_ARCH}/D42D0685.pub | sed '/^Version/d' \
22-
> /etc/pki/rpm-gpg/RPM-GPG-KEY-NVIDIA && \
23-
dnf -y update && \
24-
dnf -y install dnf-plugins-core && \
25-
dnf config-manager --set-enabled powertools && \
22+
bash /scripts/setup_cuda_rockylinux.sh && \
2623
dnf install -y tar unzip wget xz git which ninja-build gcc-toolset-10-gcc gcc-toolset-10-binutils gcc-toolset-10-gcc-c++ && \
2724
# Miniforge
2825
wget -nv -O conda.sh https://github.com/conda-forge/miniforge/releases/download/$MINIFORGE_VERSION/Miniforge3-$MINIFORGE_VERSION-Linux-${ARCH}.sh && \
@@ -42,11 +39,7 @@ RUN \
4239
dnf install -y libnccl-${NCCL_VERSION}+cuda13.1 libnccl-devel-${NCCL_VERSION}+cuda13.1 libnccl-static-${NCCL_VERSION}+cuda13.1
4340

4441
# Install lightweight sudo (not bound to TTY)
45-
RUN set -ex; \
46-
{ [ $ARCH = "aarch64" ] && export GOSU_ARCH="arm64" || export GOSU_ARCH="amd64"; } && \
47-
wget -nv -nc -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-${GOSU_ARCH}" && \
48-
chmod +x /usr/local/bin/gosu && \
49-
gosu nobody true
42+
RUN sh /scripts/install_gosu.sh
5043

5144
# Default entry-point to use if running locally
5245
# It will preserve attributes of created files

‎containers/dockerfile/Dockerfile.gpu_build_r_rockylinux8‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@ ENV F77=/opt/rh/gcc-toolset-10/root/usr/bin/gfortran
1616
ENV FC=/opt/rh/gcc-toolset-10/root/usr/bin/gfortran
1717
ENV GOSU_VERSION=1.10
1818

19+
COPY scripts/setup_cuda_rockylinux.sh scripts/install_gosu.sh /scripts/
20+
1921
# Install all basic requirements
2022
RUN \
21-
curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/D42D0685.pub | sed '/^Version/d' \
22-
> /etc/pki/rpm-gpg/RPM-GPG-KEY-NVIDIA && \
23-
dnf -y update && \
24-
dnf -y install dnf-plugins-core && \
25-
dnf config-manager --set-enabled powertools && \
23+
bash /scripts/setup_cuda_rockylinux.sh && \
2624
dnf install -y tar unzip wget xz git which ninja-build readline-devel libX11-devel libXt-devel \
2725
xorg-x11-server-devel openssl-devel zlib-devel bzip2-devel xz-devel \
2826
pcre2-devel libcurl-devel texlive-* \
@@ -47,10 +45,7 @@ RUN \
4745
ENV PATH=/opt/miniforge/bin:$PATH
4846

4947
# Install lightweight sudo (not bound to TTY)
50-
RUN set -ex; \
51-
wget -nv -nc -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" && \
52-
chmod +x /usr/local/bin/gosu && \
53-
gosu nobody true
48+
RUN sh /scripts/install_gosu.sh
5449

5550
# Default entry-point to use if running locally
5651
# It will preserve attributes of created files

‎containers/dockerfile/Dockerfile.gpu_build_rockylinux8‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,11 @@ ENV CPP=/opt/rh/gcc-toolset-10/root/usr/bin/cpp
1616
ENV CUDAHOSTCXX=/opt/rh/gcc-toolset-10/root/usr/bin/c++
1717
ENV GOSU_VERSION=1.10
1818

19+
COPY scripts/setup_cuda_rockylinux.sh scripts/install_gosu.sh /scripts/
20+
1921
# Install all basic requirements
2022
RUN \
21-
{ [ $ARCH = "aarch64" ] && export CUDA_REPO_ARCH="sbsa" || export CUDA_REPO_ARCH="x86_64"; } && \
22-
curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/rhel8/${CUDA_REPO_ARCH}/D42D0685.pub | sed '/^Version/d' \
23-
> /etc/pki/rpm-gpg/RPM-GPG-KEY-NVIDIA && \
24-
dnf -y update && \
25-
dnf -y install dnf-plugins-core && \
26-
dnf config-manager --set-enabled powertools && \
23+
bash /scripts/setup_cuda_rockylinux.sh && \
2724
dnf install -y tar unzip wget xz git which ninja-build gcc-toolset-10-gcc gcc-toolset-10-binutils gcc-toolset-10-gcc-c++ && \
2825
# Miniforge
2926
wget -nv -O conda.sh https://github.com/conda-forge/miniforge/releases/download/$MINIFORGE_VERSION/Miniforge3-$MINIFORGE_VERSION-Linux-${ARCH}.sh && \
@@ -70,11 +67,7 @@ RUN git clone -b v${RAPIDS_VERSION}.00 https://github.com/rapidsai/rmm.git --rec
7067
rm -rf rmm
7168

7269
# Install lightweight sudo (not bound to TTY)
73-
RUN set -ex; \
74-
{ [ $ARCH = "aarch64" ] && export GOSU_ARCH="arm64" || export GOSU_ARCH="amd64"; } && \
75-
wget -nv -nc -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-${GOSU_ARCH}" && \
76-
chmod +x /usr/local/bin/gosu && \
77-
gosu nobody true
70+
RUN sh /scripts/install_gosu.sh
7871

7972
# Default entry-point to use if running locally
8073
# It will preserve attributes of created files

‎containers/dockerfile/Dockerfile.i386‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ SHELL ["/bin/bash", "-c"]
55
ENV DEBIAN_FRONTEND=noninteractive
66
ENV GOSU_VERSION=1.10
77

8+
COPY scripts/install_gosu.sh /scripts/
9+
810
RUN apt-get update && apt-get upgrade -y && \
911
apt-get install -y tar unzip wget git build-essential ninja-build cmake curl ca-certificates
1012

1113
# Install lightweight sudo (not bound to TTY)
12-
RUN set -ex; \
13-
curl -o /usr/local/bin/gosu -L "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-i386" && \
14-
chmod +x /usr/local/bin/gosu && \
15-
gosu nobody true
14+
RUN sh /scripts/install_gosu.sh
1615

1716
# Default entry-point to use if running locally
1817
# It will preserve attributes of created files

‎containers/dockerfile/Dockerfile.jvm‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM rockylinux:8
22
ARG MINIFORGE_VERSION=24.9.2-0
33
ARG CMAKE_VERSION=3.31.2
4-
ARG MAVEN_VERSION=3.9.15
4+
ARG MAVEN_VERSION=3.9.16
55

66
SHELL ["/bin/bash", "-c"]
77

@@ -11,6 +11,8 @@ ENV CXX=/opt/rh/gcc-toolset-10/root/usr/bin/c++
1111
ENV CPP=/opt/rh/gcc-toolset-10/root/usr/bin/cpp
1212
ENV GOSU_VERSION=1.10
1313

14+
COPY scripts/install_gosu.sh /scripts/
15+
1416
# Install all basic requirements
1517
RUN dnf -y update && \
1618
dnf -y install dnf-plugins-core && \
@@ -33,10 +35,7 @@ RUN dnf -y update && \
3335
RUN pip install numpy pytest scipy scikit-learn wheel kubernetes awscli
3436

3537
# Install lightweight sudo (not bound to TTY)
36-
RUN set -ex; \
37-
wget -nv -nc -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" && \
38-
chmod +x /usr/local/bin/gosu && \
39-
gosu nobody true
38+
RUN sh /scripts/install_gosu.sh
4039

4140
# Default entry-point to use if running locally
4241
# It will preserve attributes of created files

‎containers/dockerfile/Dockerfile.jvm_gpu_build‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG CUDA_VERSION
44
ARG NCCL_VERSION
55
ARG MINIFORGE_VERSION=24.9.2-0
66
ARG CMAKE_VERSION=3.31.2
7-
ARG MAVEN_VERSION=3.9.15
7+
ARG MAVEN_VERSION=3.9.16
88

99
SHELL ["/bin/bash", "-c"]
1010

@@ -14,13 +14,11 @@ ENV CXX=/opt/rh/gcc-toolset-10/root/usr/bin/c++
1414
ENV CPP=/opt/rh/gcc-toolset-10/root/usr/bin/cpp
1515
ENV GOSU_VERSION=1.10
1616

17+
COPY scripts/setup_cuda_rockylinux.sh scripts/install_gosu.sh /scripts/
18+
1719
# Install all basic requirements
1820
RUN \
19-
curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/D42D0685.pub | sed '/^Version/d' \
20-
> /etc/pki/rpm-gpg/RPM-GPG-KEY-NVIDIA && \
21-
dnf -y update && \
22-
dnf -y install dnf-plugins-core && \
23-
dnf config-manager --set-enabled powertools && \
21+
bash /scripts/setup_cuda_rockylinux.sh && \
2422
dnf install -y tar unzip wget xz git which ninja-build java-17-openjdk-devel gcc-toolset-10-gcc gcc-toolset-10-binutils gcc-toolset-10-gcc-c++ && \
2523
# Miniforge
2624
wget -nv -O conda.sh https://github.com/conda-forge/miniforge/releases/download/$MINIFORGE_VERSION/Miniforge3-$MINIFORGE_VERSION-Linux-x86_64.sh && \
@@ -45,10 +43,7 @@ RUN \
4543
RUN pip install numpy pytest scipy scikit-learn wheel kubernetes awscli
4644

4745
# Install lightweight sudo (not bound to TTY)
48-
RUN set -ex; \
49-
wget -nv -nc -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" && \
50-
chmod +x /usr/local/bin/gosu && \
51-
gosu nobody true
46+
RUN sh /scripts/install_gosu.sh
5247

5348
# Default entry-point to use if running locally
5449
# It will preserve attributes of created files

0 commit comments

Comments
 (0)