From 6db7f727ee27ffa5cff80195f8604802e4a3b4d6 Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Sat, 25 Jan 2020 22:53:41 -0800 Subject: [PATCH] Add missing deps for linux image (#8958) * add missing deps for linux image * use docker versioning * add comment to linux docker container --- build/azure-pipelines/linux/Dockerfile | 4 +++- build/azure-pipelines/sql-product-build.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/azure-pipelines/linux/Dockerfile b/build/azure-pipelines/linux/Dockerfile index 76bac77094..f499cc4ceb 100644 --- a/build/azure-pipelines/linux/Dockerfile +++ b/build/azure-pipelines/linux/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update --fix-missing 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 + libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++-4.8 #docker RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - @@ -15,6 +15,8 @@ RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubunt RUN apt-get update RUN apt-get -y install docker-ce docker-ce-cli containerd.io +# This image needs to be built on a linux host; some weird stuff happens and the xvfb service won't start +# if built on a windows host. ADD ./xvfb.init /etc/init.d/xvfb RUN chmod +x /etc/init.d/xvfb RUN update-rc.d xvfb defaults diff --git a/build/azure-pipelines/sql-product-build.yml b/build/azure-pipelines/sql-product-build.yml index a076debbef..3ac8f8dce2 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:x64 + image: sqltoolscontainers.azurecr.io/linux-build-agent:1 endpoint: ContainerRegistry jobs: