Skip to content

Commit cb3db77

Browse files
committed
Fix build: handle missing ubuntu.sources for deb-src
Check for the existence of /etc/apt/sources.list.d/ubuntu.sources before modifying it, falling back to /etc/apt/sources.list if needed. This fixes build failures on base images where the sources file location differs. Signed-off-by: Fred Rolland <frolland@nvidia.com>
1 parent 0cf229e commit cb3db77

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ ENV MFT_VERSION=4.33.0-169
5151
ARG PACKAGES="dpkg-dev=1.22.6ubuntu6.5"
5252

5353
# enable deb-src repos
54-
RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
54+
RUN if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then \
55+
sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources; \
56+
elif [ -f /etc/apt/sources.list ]; then \
57+
sed -i 's/^#\s*deb-src/deb-src/' /etc/apt/sources.list; \
58+
fi
5559

5660
RUN apt-get update -y
5761
RUN apt-get install -y --no-install-recommends ${PACKAGES}

Dockerfile.nic-configuration-daemon

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ ENV MFT_VERSION=4.33.0-169
3434
ARG PACKAGES="dpkg-dev=1.22.6ubuntu6.5 libusb-1.0-0=2:1.0.27-1 ipmitool=1.8.19-7ubuntu0.24.04.3 rshim curl=8.5.0-2ubuntu10.6 systemd-sysv=255.4-1ubuntu8.12 mstflint=4.26.0+1-2ubuntu3"
3535

3636
# enable deb-src repos
37-
RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
37+
RUN if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then \
38+
sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources; \
39+
elif [ -f /etc/apt/sources.list ]; then \
40+
sed -i 's/^#\s*deb-src/deb-src/' /etc/apt/sources.list; \
41+
fi
3842

3943
RUN apt-get update -y
4044
RUN apt-get install -y --no-install-recommends ${PACKAGES}

0 commit comments

Comments
 (0)