From fda112b69f32c24e4b89b4f5f224c6c7fb98e577 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Mon, 17 Jul 2023 22:29:12 -0700 Subject: [PATCH] Update build container to use G++-7 (#23912) --- build/azure-pipelines/linux/Dockerfile | 20 +++++++++++++++----- build/azure-pipelines/sql-product-build.yml | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/build/azure-pipelines/linux/Dockerfile b/build/azure-pipelines/linux/Dockerfile index 6661c362d0..1fc910372a 100644 --- a/build/azure-pipelines/linux/Dockerfile +++ b/build/azure-pipelines/linux/Dockerfile @@ -1,7 +1,11 @@ -#Download base image ubuntu 22.04 -FROM mcr.microsoft.com/mirror/docker/library/ubuntu:22.04 +# Download base image ubuntu 20.04 +FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 -#Set timezone to avoid blocking prompts on docker build +# Adding apt repos for g++-7 +RUN echo "deb http://dk.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN echo "deb http://dk.archive.ubuntu.com/ubuntu/ bionic universe" >> /etc/apt/sources.list + +# Set timezone to avoid blocking prompts on docker build ENV TZ=America/Los_Angeles RUN ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime RUN echo "$TZ" > /etc/timezone @@ -14,13 +18,19 @@ RUN apt-get update && apt-get upgrade -y RUN apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 \ libkrb5-dev git apt-transport-https ca-certificates curl gnupg-agent software-properties-common \ - libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++ libgbm-dev wget + libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++-7 libgbm-dev wget + + +# make GCC 7 the default compiler +RUN rm /usr/bin/gcc +RUN ln -s /usr/bin/gcc-7 /usr/bin/gcc +RUN ln -s /usr/bin/g++-7 /usr/bin/g++ # Adding Libssl for dotnet 5.0 and ESRP signing to work RUN wget -c http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb RUN dpkg -i libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb -#docker +# docker RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - RUN apt-key fingerprint 0EBFCD88 RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" diff --git a/build/azure-pipelines/sql-product-build.yml b/build/azure-pipelines/sql-product-build.yml index 05c2874d02..4e48d315b4 100644 --- a/build/azure-pipelines/sql-product-build.yml +++ b/build/azure-pipelines/sql-product-build.yml @@ -1,7 +1,7 @@ resources: containers: - container: linux-x64 - image: sqltoolscontainers.azurecr.io/linux-build-agent:8 + image: sqltoolscontainers.azurecr.io/linux-build-agent:9 endpoint: SqlToolsContainers stages: