Install NASM 2.16 for Ubuntu Bionic base images (#1978)

b/264574490 Change-Id: I566481b595a80c850a29dd421635577adbf39250
youtube · Nov 14, 2023 · 0c7e319 · 0c7e319
1 parent e4ede3d
commit 0c7e319
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docker/linux/clang-3-9/Dockerfile b/docker/linux/clang-3-9/Dockerfile
@@ -16,12 +16,14 @@ FROM linux-x64x11-bionic
 
 ARG DEBIAN_FRONTEND=noninteractive
 
+# Note: NASM 2.16 is obtained via PPA for ubuntu distributions older than 20.04
 RUN apt update -qqy \
     && apt install -qqy --no-install-recommends \
         clang-3.9 software-properties-common \
     && add-apt-repository -y ppa:git-core/ppa \
+    && add-apt-repository -y ppa:savoury1/backports \
     && apt update -qqy \
-    && apt install -qqy --no-install-recommends git \
+    && apt install -qqy --no-install-recommends git nasm \
     && /opt/clean-after-apt.sh
 
 CMD gn gen ${OUTDIR}/${PLATFORM}_${CONFIG} --args="target_platform=\"${PLATFORM}\" build_type=\"${CONFIG}\" using_old_compiler=true" && \

diff --git a/docker/linux/gcc-6-3/Dockerfile b/docker/linux/gcc-6-3/Dockerfile
@@ -16,12 +16,14 @@ FROM linux-x64x11-bionic
 
 ARG DEBIAN_FRONTEND=noninteractive
 
+# Note: NASM 2.16 is obtained via PPA for ubuntu distributions older than 20.04
 RUN apt update -qqy \
     && apt install -qqy --no-install-recommends \
         gcc-6 g++-6 software-properties-common \
     && add-apt-repository -y ppa:git-core/ppa \
+    && add-apt-repository -y ppa:savoury1/backports \
     && apt update -qqy \
-    && apt install -qqy --no-install-recommends git \
+    && apt install -qqy --no-install-recommends git nasm \
     && /opt/clean-after-apt.sh
 
 CMD gn gen ${OUTDIR}/${PLATFORM}${SB_API_VERSION:+-sbversion-$SB_API_VERSION}_${CONFIG:-debug} --args="target_platform=\"${PLATFORM}\" build_type=\"${CONFIG:-debug}\" is_clang=false using_old_compiler=true ${SB_API_VERSION:+sb_api_version=$SB_API_VERSION}" && \