From 04e5a20ecb40ee1bdd7f86d0e64a9df3756c27c8 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Fri, 21 Jul 2017 17:09:21 +0200 Subject: [PATCH] ia32 x64 docker files --- build/tfs/linux/ia32/Dockerfile | 5 +++-- build/tfs/linux/ia32/run-agent.sh | 15 +++++++++++++++ build/tfs/linux/{ => x64}/Dockerfile | 22 ++++++++++------------ build/tfs/linux/{ => x64}/run-agent.sh | 8 ++++---- build/tfs/linux/{ => x64}/xvfb.init | 0 5 files changed, 32 insertions(+), 18 deletions(-) create mode 100755 build/tfs/linux/ia32/run-agent.sh rename build/tfs/linux/{ => x64}/Dockerfile (63%) rename build/tfs/linux/{ => x64}/run-agent.sh (57%) rename build/tfs/linux/{ => x64}/xvfb.init (100%) diff --git a/build/tfs/linux/ia32/Dockerfile b/build/tfs/linux/ia32/Dockerfile index bf6315cfcee..7ef9b41ebc9 100644 --- a/build/tfs/linux/ia32/Dockerfile +++ b/build/tfs/linux/ia32/Dockerfile @@ -1,13 +1,13 @@ FROM microsoft/vsts-agent:ubuntu-14.04-standard MAINTAINER Joao Moreno +ARG DEBIAN_FRONTEND=noninteractive RUN dpkg --add-architecture i386 RUN apt-get update # Dependencies RUN apt-get install -y build-essential -RUN apt-get install -y gcc:i386 g++:i386 -RUN apt-get install -y gcc-multilib:i386 g++-multilib:i386 +RUN apt-get install -y gcc-multilib g++-multilib RUN apt-get install -y zip RUN apt-get install -y rpm RUN apt-get install -y createrepo @@ -31,6 +31,7 @@ RUN apt-get install -y libgl1-mesa-glx:i386 libgl1-mesa-dri:i386 RUN apt-get install -y libxkbfile-dev RUN apt-get install -y bc bsdmainutils RUN apt-get install -y libgirepository-1.0-1:i386 gir1.2-glib-2.0:i386 gir1.2-secret-1:i386 libsecret-1-dev:i386 +RUN apt-get install -y dpkg-dev:i386 # Xvfb # Thanks https://medium.com/@griggheo/running-headless-selenium-webdriver-tests-in-docker-containers-342fdbabf756 diff --git a/build/tfs/linux/ia32/run-agent.sh b/build/tfs/linux/ia32/run-agent.sh new file mode 100755 index 00000000000..bcf9017f3cf --- /dev/null +++ b/build/tfs/linux/ia32/run-agent.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ ! -f pat ]; then + echo "Error: file pat not found" + exit 1 +fi + +docker run \ + -e VSTS_ACCOUNT="monacotools" \ + -e VSTS_TOKEN="$(cat pat)" \ + -e VSTS_AGENT="tb-lnx-ia32-local" \ + -e VSTS_POOL="linux-ia32" \ + -e VSTS_WORK="/var/vsts/work" \ + --name "tb-lnx-ia32-local" \ + -it joaomoreno/vscode-vso-agent-ia32:latest \ No newline at end of file diff --git a/build/tfs/linux/Dockerfile b/build/tfs/linux/x64/Dockerfile similarity index 63% rename from build/tfs/linux/Dockerfile rename to build/tfs/linux/x64/Dockerfile index 63f9b87f7d2..489d37f3fc0 100644 --- a/build/tfs/linux/Dockerfile +++ b/build/tfs/linux/x64/Dockerfile @@ -1,12 +1,13 @@ FROM microsoft/vsts-agent:ubuntu-14.04-standard MAINTAINER Joao Moreno -RUN dpkg --add-architecture i386 +ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update # Dependencies RUN apt-get install -y build-essential RUN apt-get install -y gcc-multilib g++-multilib +RUN apt-get install -y dpkg-dev RUN apt-get install -y zip RUN apt-get install -y rpm RUN apt-get install -y createrepo @@ -14,19 +15,16 @@ RUN apt-get install -y python-gtk2 RUN apt-get install -y jq RUN apt-get install -y xvfb RUN apt-get install -y fakeroot -RUN apt-get install -y libgtk2.0-0 libgtk2.0-0:i386 -RUN apt-get install -y libgconf-2-4 libgconf-2-4:i386 -RUN apt-get install -y libnss3 libnss3:i386 -RUN apt-get install -y libasound2 libasound2:i386 -RUN apt-get install -y libxtst6 libxtst6:i386 +RUN apt-get install -y libgtk2.0-0 +RUN apt-get install -y libgconf-2-4 +RUN apt-get install -y libnss3 +RUN apt-get install -y libasound2 +RUN apt-get install -y libxtst6 RUN apt-get install -y libfuse2 RUN apt-get install -y libnotify-bin -RUN apt-get install -y libnotify4:i386 -RUN apt-get install -y libx11-dev libx11-dev:i386 -RUN apt-get install -y libxkbfile-dev:i386 -RUN apt-get install -y libxss1 libxss1:i386 -RUN apt-get install -y libx11-xcb-dev libx11-xcb-dev:i386 -RUN apt-get install -y libgl1-mesa-glx:i386 libgl1-mesa-dri:i386 +RUN apt-get install -y libx11-dev +RUN apt-get install -y libxss1 +RUN apt-get install -y libx11-xcb-dev RUN apt-get install -y libxkbfile-dev RUN apt-get install -y bc bsdmainutils RUN apt-get install -y libsecret-1-dev diff --git a/build/tfs/linux/run-agent.sh b/build/tfs/linux/x64/run-agent.sh similarity index 57% rename from build/tfs/linux/run-agent.sh rename to build/tfs/linux/x64/run-agent.sh index 9e09eed1447..76978ce2b02 100755 --- a/build/tfs/linux/run-agent.sh +++ b/build/tfs/linux/x64/run-agent.sh @@ -8,8 +8,8 @@ fi docker run \ -e VSTS_ACCOUNT="monacotools" \ -e VSTS_TOKEN="$(cat pat)" \ - -e VSTS_AGENT="tb-lnx-local" \ - -e VSTS_POOL=linux \ + -e VSTS_AGENT="tb-lnx-x64-local" \ + -e VSTS_POOL="linux-x64" \ -e VSTS_WORK="/var/vsts/work" \ - --name "tb-lnx-local" \ - -it joaomoreno/vscode-vso-agent \ No newline at end of file + --name "tb-lnx-x64-local" \ + -it joaomoreno/vscode-vso-agent-x64:latest \ No newline at end of file diff --git a/build/tfs/linux/xvfb.init b/build/tfs/linux/x64/xvfb.init similarity index 100% rename from build/tfs/linux/xvfb.init rename to build/tfs/linux/x64/xvfb.init