Skip to content

Commit 83bd24e

Browse files
authored
Merge pull request NVIDIA#9 from maxamillion/container-builds
fix: enable Fedora repos and fix package availability in Hummingbird images
2 parents d92caee + 5ffdb63 commit 83bd24e

2 files changed

Lines changed: 21 additions & 9 deletions

File tree

‎deploy/docker/Dockerfile.ci‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ ENV MISE_DATA_DIR=/opt/mise
1717
ENV MISE_CACHE_DIR=/opt/mise/cache
1818
ENV PATH="/opt/mise/shims:/root/.cargo/bin:/root/.local/bin:$PATH"
1919

20+
# Enable standard Fedora repos for packages not in Hummingbird repo
21+
RUN dnf install -y fedora-repos
22+
2023
# Install system dependencies
2124
RUN dnf install -y \
2225
ca-certificates \

‎deploy/docker/Dockerfile.images‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ ARG CARGO_CODEGEN_UNITS
3838
ENV TARGETARCH=$TARGETARCH \
3939
BUILDARCH=$BUILDARCH
4040

41-
RUN dnf install -y cmake gcc-c++ make protobuf-compiler curl && dnf clean all
41+
RUN dnf install -y fedora-repos && \
42+
dnf install -y cmake gcc-c++ make protobuf-compiler curl && dnf clean all
4243

4344
COPY deploy/docker/cross-build.sh /usr/local/bin/
4445
RUN . cross-build.sh && install_cross_toolchain && install_sccache && add_rust_target
@@ -187,25 +188,32 @@ CMD ["--port", "8080"]
187188
# ---------------------------------------------------------------------------
188189
FROM rancher/k3s:${K3S_VERSION}@${K3S_DIGEST} AS k3s
189190

190-
FROM quay.io/hummingbird/curl:latest-builder AS k9s
191+
FROM quay.io/hummingbird/core-runtime:latest-builder AS k9s
192+
USER root
191193
ARG K9S_VERSION
192194
ARG TARGETARCH
193-
RUN curl -fsSL "https://github.com/derailed/k9s/releases/download/${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz" \
195+
RUN dnf install -y curl tar gzip && \
196+
curl -fsSL "https://github.com/derailed/k9s/releases/download/${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz" \
194197
| tar xz -C /tmp k9s && \
195-
chmod +x /tmp/k9s
198+
chmod +x /tmp/k9s && \
199+
dnf clean all
196200

197-
FROM quay.io/hummingbird/curl:latest-builder AS helm
201+
FROM quay.io/hummingbird/core-runtime:latest-builder AS helm
202+
USER root
198203
ARG HELM_VERSION
199204
ARG TARGETARCH
200-
RUN curl -fsSL "https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz" \
205+
RUN dnf install -y curl tar gzip && \
206+
curl -fsSL "https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz" \
201207
| tar xz --strip-components=1 -C /tmp "linux-${TARGETARCH}/helm" && \
202-
chmod +x /tmp/helm
208+
chmod +x /tmp/helm && \
209+
dnf clean all
203210

204211
FROM quay.io/hummingbird/core-runtime:latest-builder AS nvidia-container-toolkit
205212
USER root
206213
ARG NVIDIA_CONTAINER_TOOLKIT_VERSION
207214

208-
RUN curl -s -L https://nvidia.github.io/libnvidia-container/stable/rpm/nvidia-container-toolkit.repo \
215+
RUN dnf install -y ca-certificates && \
216+
curl -s -L https://nvidia.github.io/libnvidia-container/stable/rpm/nvidia-container-toolkit.repo \
209217
| tee /etc/yum.repos.d/nvidia-container-toolkit.repo && \
210218
dnf install -y \
211219
"nvidia-container-toolkit-base-${NVIDIA_CONTAINER_TOOLKIT_VERSION}" && \
@@ -217,7 +225,8 @@ RUN curl -s -L https://nvidia.github.io/libnvidia-container/stable/rpm/nvidia-co
217225
FROM quay.io/hummingbird/core-runtime:latest-builder AS cluster
218226
USER root
219227

220-
RUN dnf install -y \
228+
RUN dnf install -y fedora-repos && \
229+
dnf install -y \
221230
ca-certificates \
222231
iptables \
223232
util-linux \

0 commit comments

Comments
 (0)