ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add missing deps for linux image (#8958)

Browse Source 
* add missing deps for linux image

* use docker versioning

* add comment to linux docker container
This commit is contained in:
Anthony Dresser
2020-01-25 22:53:41 -08:00
committed by GitHub
parent 379eae22ed
commit a41073adbf
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/azure-pipelines/linux/Dockerfile
View File

@@ -6,7 +6,7 @@ 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 libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++-4.8
RUN rm /usr/bin/gcc RUN rm /usr/bin/gcc
RUN rm /usr/bin/g++ RUN rm /usr/bin/g++
@@ -20,6 +20,8 @@ RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubunt
RUN apt-get update RUN apt-get update
RUN apt-get -y install docker-ce docker-ce-cli containerd.io 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 ADD ./xvfb.init /etc/init.d/xvfb
RUN chmod +x /etc/init.d/xvfb RUN chmod +x /etc/init.d/xvfb
RUN update-rc.d xvfb defaults RUN update-rc.d xvfb defaults

2
build/azure-pipelines/sql-product-build.yml
View File

@@ -1,7 +1,7 @@
resources: resources:
containers: containers:
- container: linux-x64 - container: linux-x64
image: sqltoolscontainers.azurecr.io/linux-build-agent:x64 image: sqltoolscontainers.azurecr.io/linux-build-agent:1
endpoint: ContainerRegistry endpoint: ContainerRegistry
jobs: jobs: