Skip to content

Commit 588675b

Browse files
TyriarTyriar
committed
Update dockerfile
1 parent 7097e0b commit 588675b

1 file changed

Lines changed: 30 additions & 27 deletions

File tree

‎build/tfs/linux/x64-snap/Dockerfile‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
11
FROM microsoft/vsts-agent:ubuntu-16.04-standard
2-
MAINTAINER Joao Moreno <joao.moreno@microsoft.com>
2+
MAINTAINER Daniel Imms <daimms@microsoft.com>
33

44
ARG DEBIAN_FRONTEND=noninteractive
55
RUN apt-get update
66

77
# Dependencies
8-
RUN apt-get install -y build-essential
9-
RUN apt-get install -y gcc-multilib g++-multilib
10-
RUN apt-get install -y git
11-
RUN apt-get install -y dpkg-dev
12-
RUN apt-get install -y zip
13-
RUN apt-get install -y rpm
14-
RUN apt-get install -y createrepo
15-
RUN apt-get install -y python-gtk2
16-
RUN apt-get install -y jq
17-
RUN apt-get install -y xvfb
18-
RUN apt-get install -y fakeroot
19-
RUN apt-get install -y libgtk2.0-0
20-
RUN apt-get install -y libgconf-2-4
21-
RUN apt-get install -y libnss3
22-
RUN apt-get install -y libasound2
23-
RUN apt-get install -y libxtst6
24-
RUN apt-get install -y libfuse2
25-
RUN apt-get install -y libnotify-bin
26-
RUN apt-get install -y libx11-dev
27-
RUN apt-get install -y libxss1
28-
RUN apt-get install -y libx11-xcb-dev
29-
RUN apt-get install -y libxkbfile-dev
30-
RUN apt-get install -y bc bsdmainutils
31-
RUN apt-get install -y libsecret-1-dev
8+
RUN apt-get install -y build-essential \
9+
gcc-multilib \
10+
g++-multilib \
11+
git \
12+
dpkg-dev \
13+
zip \
14+
rpm \
15+
createrepo \
16+
python-gtk2 \
17+
jq \
18+
xvfb \
19+
fakeroot \
20+
libgtk2.0-0 \
21+
libgconf-2-4 \
22+
libnss3 \
23+
libasound2 \
24+
libxtst6 \
25+
libfuse2 \
26+
libnotify-bin \
27+
libx11-dev \
28+
libxss1 \
29+
libx11-xcb-dev \
30+
libxkbfile-dev \
31+
bc \
32+
bsdmainutils \
33+
libsecret-1-dev
3234

3335
# Xvfb
3436
# Thanks https://medium.com/@griggheo/running-headless-selenium-webdriver-tests-in-docker-containers-342fdbabf756
35-
ADD xvfb.init /etc/init.d/xvfb
37+
ADD ../x64/xvfb.init /etc/init.d/xvfb
3638
RUN chmod +x /etc/init.d/xvfb
3739
RUN update-rc.d xvfb defaults
3840

@@ -43,6 +45,8 @@ RUN ln -sf /bin/dbus-daemon /usr/bin/dbus-daemon
4345
ENV NVM_DIR /usr/local/nvm
4446
RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
4547

48+
# snapcraft
49+
# From https://github.com/snapcore/snapcraft/tree/master/docker
4650
RUN apt-get update && \
4751
apt-get dist-upgrade --yes && \
4852
apt-get install --yes \
@@ -57,7 +61,6 @@ RUN apt-get update && \
5761
chmod a+x /snap/bin/snapcraft && \
5862
apt-get autoclean --yes && \
5963
apt-get clean --yes
60-
6164
ENV SNAP=/snap/snapcraft/current
6265
ENV SNAP_NAME=snapcraft
6366
ENV SNAP_VERSION=beta

0 commit comments

Comments
 (0)