Update build container to use G++-7 (#23912) (#23914)

This commit is contained in:
Karl Burtram
2023-07-18 07:45:48 -07:00
committed by GitHub
parent 6092b0a00b
commit ff10e3a042
2 changed files with 16 additions and 6 deletions

View File

@@ -1,5 +1,9 @@
#Download base image ubuntu 22.04 # Download base image ubuntu 20.04
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:22.04 FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04
# 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 # Set timezone to avoid blocking prompts on docker build
ENV TZ=America/Los_Angeles ENV TZ=America/Los_Angeles
@@ -14,7 +18,13 @@ 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 \ 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 \ 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 # 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 wget -c http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb

View File

@@ -1,7 +1,7 @@
resources: resources:
containers: containers:
- container: linux-x64 - container: linux-x64
image: sqltoolscontainers.azurecr.io/linux-build-agent:8 image: sqltoolscontainers.azurecr.io/linux-build-agent:9
endpoint: SqlToolsContainers endpoint: SqlToolsContainers
stages: stages: