Ubuntu updates

build.sh

@@ -3,11 +3,32 @@ set -e
 
 cd "$(dirname $0)"
 
+count=0
+start=$(date +%s)
+
 while read dir; do
-  docker build -t microsoft/vsts-agent:${dir//\//-} $dir
+  echo "Building $dir"
+  docker build -q -t microsoft/vsts-agent:${dir//\//-} $dir
+  _=$((count+=1))
 done < <(./dirs.sh $1)
 
 LATEST_TAG=$(cat latest.tag)
 if [ -n "$(docker images -f reference=microsoft/vsts-agent:$LATEST_TAG -q)" ]; then
   docker tag microsoft/vsts-agent:$LATEST_TAG microsoft/vsts-agent
 fi
+
+end=$(date +%s)
+((seconds=end-start))
+
+if (( $seconds > 3600 )) ; then
+    ((hours=seconds/3600))
+    ((minutes=(seconds%3600)/60))
+    ((seconds=(seconds%3600)%60))
+    echo "Built $count images in $hours hour(s), $minutes minute(s) and $seconds second(s)" 
+elif (( $seconds > 60 )) ; then
+    ((minutes=(seconds%3600)/60))
+    ((seconds=(seconds%3600)%60))
+    echo "Built $count images in $minutes minute(s) and $seconds second(s)"
+else
+    echo "Built $count images in $seconds seconds"
+fi

ubuntu/14.04/Dockerfile

@@ -1,5 +1,13 @@
 FROM ubuntu:14.04
 
+# Trusty needs an updated backport of apt to avoid hash sum mismatch errors
+RUN [ "$(UBUNTU_RELEASE)" = "trusty" ] \
+ && curl -s https://packagecloud.io/install/repositories/computology/apt-backport/script.deb.sh |  bash \
+ && apt-get update \
+ && apt-get install apt=1.2.10 \
+ && rm -rf /var/lib/apt/lists/* \
+ || echo -n
+
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
         software-properties-common \

ubuntu/14.04/standard/Dockerfile

@@ -68,7 +68,7 @@ RUN curl -sL https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.sh -o cmake
  && rm cmake.sh
 
 # Install Erlang
-RUN echo "deb http://binaries.erlang-solutions.com/debian xenial contrib" > /etc/apt/sources.list.d/eslerlang.list \
+RUN echo "deb http://binaries.erlang-solutions.com/debian trusty contrib" > /etc/apt/sources.list.d/eslerlang.list \
  && wget -O - http://binaries.erlang-solutions.com/debian/erlang_solutions.asc | sudo apt-key add - \
  && apt-get update \
  && apt-get install -y --no-install-recommends esl-erlang \
@@ -197,6 +197,16 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E03280
  && apt-get install -y --no-install-recommends apt-transport-https mono-complete \
  && rm -rf /var/lib/apt/lists/*
 
+# Install MS SQL Server client tools (https://docs.microsoft.com/en-us/sql/linux/sql-server-linux-setup-tools?view=sql-server-2017)
+RUN [ "trusty" = "xenial" ] \
+  && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
+  && curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list \
+  && apt-get update \
+  && apt-get install -y mssql-tools unixodbc-dev \
+  && rm -rf /var/lib/apt/lists/* \
+  || echo -n
+ENV PATH=$PATH:/opt/mssql-tools/bin
+
 # Install MySQL Client
 RUN apt-get update \
   && apt-get install -y mysql-client \
@@ -479,21 +489,23 @@ RUN wget -q -O rebar3 https://s3.amazonaws.com/rebar3/rebar3 \
 
 # Install Ruby requirements
 RUN apt-get update \
- && apt-get install -y libz-dev openssl libssl-dev
+ && apt-get install -y libz-dev openssl libssl-dev \
+ && rm -rf /var/lib/apt/lists/*
 
 # Install Scala build tools
 RUN curl -s https://raw.githubusercontent.com/paulp/sbt-extras/master/sbt > /usr/local/bin/sbt \
  && chmod 0755 /usr/local/bin/sbt
 
 # Install Sphinx
-RUN apt-get update \
+RUN [ "trusty" = "xenial" ] \
+  && apt-get update \
   && apt-get install -y sphinxsearch \
-  && rm -rf /var/lib/apt/lists/*
+  && rm -rf /var/lib/apt/lists/* \
+  || echo -n
 
 # Install Subversion
 RUN apt-get update \
- && apt-get install -y --no-install-recommends \
-    subversion \
+ && apt-get install -y --no-install-recommends subversion \
  && rm -rf /var/lib/apt/lists/*
 ENV svn=/usr/bin/svn
 

ubuntu/16.04/Dockerfile

@@ -1,5 +1,13 @@
 FROM ubuntu:16.04
 
+# Trusty needs an updated backport of apt to avoid hash sum mismatch errors
+RUN [ "$(UBUNTU_RELEASE)" = "trusty" ] \
+ && curl -s https://packagecloud.io/install/repositories/computology/apt-backport/script.deb.sh |  bash \
+ && apt-get update \
+ && apt-get install apt=1.2.10 \
+ && rm -rf /var/lib/apt/lists/* \
+ || echo -n
+
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
         software-properties-common \

ubuntu/16.04/standard/Dockerfile

@@ -198,11 +198,13 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E03280
  && rm -rf /var/lib/apt/lists/*
 
 # Install MS SQL Server client tools (https://docs.microsoft.com/en-us/sql/linux/sql-server-linux-setup-tools?view=sql-server-2017)
-RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
+RUN [ "xenial" = "xenial" ] \
+  && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
   && curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list \
   && apt-get update \
   && apt-get install -y mssql-tools unixodbc-dev \
-  && rm -rf /var/lib/apt/lists/*
+  && rm -rf /var/lib/apt/lists/* \
+  || echo -n
 ENV PATH=$PATH:/opt/mssql-tools/bin
 
 # Install MySQL Client
@@ -487,21 +489,23 @@ RUN wget -q -O rebar3 https://s3.amazonaws.com/rebar3/rebar3 \
 
 # Install Ruby requirements
 RUN apt-get update \
- && apt-get install -y libz-dev openssl libssl-dev
+ && apt-get install -y libz-dev openssl libssl-dev \
+ && rm -rf /var/lib/apt/lists/*
 
 # Install Scala build tools
 RUN curl -s https://raw.githubusercontent.com/paulp/sbt-extras/master/sbt > /usr/local/bin/sbt \
  && chmod 0755 /usr/local/bin/sbt
 
 # Install Sphinx
-RUN apt-get update \
+RUN [ "xenial" = "xenial" ] \
+  && apt-get update \
   && apt-get install -y sphinxsearch \
-  && rm -rf /var/lib/apt/lists/*
+  && rm -rf /var/lib/apt/lists/* \
+  || echo -n
 
 # Install Subversion
 RUN apt-get update \
- && apt-get install -y --no-install-recommends \
-    subversion \
+ && apt-get install -y --no-install-recommends subversion \
  && rm -rf /var/lib/apt/lists/*
 ENV svn=/usr/bin/svn
 

ubuntu/Dockerfile.template

@@ -1,5 +1,13 @@
 FROM ubuntu:$(UBUNTU_VERSION)
 
+# Trusty needs an updated backport of apt to avoid hash sum mismatch errors
+RUN [ "$(UBUNTU_RELEASE)" = "trusty" ] \
+ && curl -s https://packagecloud.io/install/repositories/computology/apt-backport/script.deb.sh |  bash \
+ && apt-get update \
+ && apt-get install apt=1.2.10 \
+ && rm -rf /var/lib/apt/lists/* \
+ || echo -n
+
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
         software-properties-common \

ubuntu/standard/Dockerfile.template

@@ -68,7 +68,7 @@ RUN curl -sL https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.sh -o cmake
  && rm cmake.sh
 
 # Install Erlang
-RUN echo "deb http://binaries.erlang-solutions.com/debian xenial contrib" > /etc/apt/sources.list.d/eslerlang.list \
+RUN echo "deb http://binaries.erlang-solutions.com/debian $(UBUNTU_RELEASE) contrib" > /etc/apt/sources.list.d/eslerlang.list \
  && wget -O - http://binaries.erlang-solutions.com/debian/erlang_solutions.asc | sudo apt-key add - \
  && apt-get update \
  && apt-get install -y --no-install-recommends esl-erlang \
@@ -197,6 +197,16 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E03280
  && apt-get install -y --no-install-recommends apt-transport-https mono-complete \
  && rm -rf /var/lib/apt/lists/*
 
+# Install MS SQL Server client tools (https://docs.microsoft.com/en-us/sql/linux/sql-server-linux-setup-tools?view=sql-server-2017)
+RUN [ "$(UBUNTU_RELEASE)" = "xenial" ] \
+  && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
+  && curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list \
+  && apt-get update \
+  && apt-get install -y mssql-tools unixodbc-dev \
+  && rm -rf /var/lib/apt/lists/* \
+  || echo -n
+ENV PATH=$PATH:/opt/mssql-tools/bin
+
 # Install MySQL Client
 RUN apt-get update \
   && apt-get install -y mysql-client \
@@ -479,21 +489,23 @@ RUN wget -q -O rebar3 https://s3.amazonaws.com/rebar3/rebar3 \
 
 # Install Ruby requirements
 RUN apt-get update \
- && apt-get install -y libz-dev openssl libssl-dev
+ && apt-get install -y libz-dev openssl libssl-dev \
+ && rm -rf /var/lib/apt/lists/*
 
 # Install Scala build tools
 RUN curl -s https://raw.githubusercontent.com/paulp/sbt-extras/master/sbt > /usr/local/bin/sbt \
  && chmod 0755 /usr/local/bin/sbt
 
 # Install Sphinx
-RUN apt-get update \
+RUN [ "$(UBUNTU_RELEASE)" = "xenial" ] \
+  && apt-get update \
   && apt-get install -y sphinxsearch \
-  && rm -rf /var/lib/apt/lists/*
+  && rm -rf /var/lib/apt/lists/* \
+  || echo -n
 
 # Install Subversion
 RUN apt-get update \
- && apt-get install -y --no-install-recommends \
-    subversion \
+ && apt-get install -y --no-install-recommends subversion \
  && rm -rf /var/lib/apt/lists/*
 ENV svn=/usr/bin/svn