Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ ENV MFT_VERSION=4.33.0-169
ARG PACKAGES="dpkg-dev=1.22.6ubuntu6.5"

# enable deb-src repos
RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
RUN if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then \
sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources; \
elif [ -f /etc/apt/sources.list ]; then \
sed -i 's/^#\s*deb-src/deb-src/' /etc/apt/sources.list; \
fi
Comment on lines +54 to +58
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deb-src not enabled

The /etc/apt/sources.list fallback only uncomments lines that start with # deb-src, but many Ubuntu images ship active deb lines without any deb-src lines at all. In that case, this sed no-ops and apt-get source ${PACKAGES} will still fail (the same build failure, just on a different base). Consider ensuring a deb-src entry exists (or enabling deb-src from existing deb entries) rather than only uncommenting existing deb-src lines.


# DOCA repositories have a GPG issue, so we need to allow insecure repositories.
# GPG error: https://linux.mellanox.com/public/repo/doca/3.2.1/ubuntu22.04/x86_64 ./ Release: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY A024F6F0E0E6D6A281
Expand Down
6 changes: 5 additions & 1 deletion Dockerfile.nic-configuration-daemon
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ ENV MFT_VERSION=4.33.0-169
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"

# enable deb-src repos
RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
RUN if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then \
sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources; \
elif [ -f /etc/apt/sources.list ]; then \
sed -i 's/^#\s*deb-src/deb-src/' /etc/apt/sources.list; \
fi
Comment on lines +37 to +41
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deb-src not enabled

Same issue as in Dockerfile: if the base image only has deb entries (common) and no deb-src lines, the fallback sed -i 's/^#\s*deb-src/deb-src/' does nothing, and apt-get source ${PACKAGES} later will still fail. This needs to create/enable deb-src sources rather than only uncomment them.


# DOCA repositories have a GPG issue, so we need to allow insecure repositories.
# GPG error: https://linux.mellanox.com/public/repo/doca/3.2.1/ubuntu22.04/x86_64 ./ Release: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY A024F6F0E0E6D6A281
Expand Down
Loading