From 75fc4e229719e7ec433ca9f5689807a79ff73759 Mon Sep 17 00:00:00 2001 From: Ben Hall Date: Wed, 17 May 2017 16:29:18 +0100 Subject: [PATCH 1/4] Use fixed version of Ubuntu to prevent breaking changes --- src/DockerBase/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DockerBase/Dockerfile b/src/DockerBase/Dockerfile index b6982b949b..c7945a4f76 100644 --- a/src/DockerBase/Dockerfile +++ b/src/DockerBase/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu +FROM ubuntu:16.04 MAINTAINER GitTools Maintainers From 325962385906902b2c2396f190d4313e1ccd4a6a Mon Sep 17 00:00:00 2001 From: Ben Hall Date: Wed, 17 May 2017 16:32:24 +0100 Subject: [PATCH 2/4] Combine to a single RUN command and clean cache afterwards --- src/DockerBase/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/DockerBase/Dockerfile b/src/DockerBase/Dockerfile index c7945a4f76..a06ff91051 100644 --- a/src/DockerBase/Dockerfile +++ b/src/DockerBase/Dockerfile @@ -5,9 +5,7 @@ MAINTAINER GitTools Maintainers # Wheezy doesn't support glibc 2.15 which libgit2sharp requires # So we are going to install mono on ubuntu instead RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -RUN apt-get update -RUN apt-get install libcurl3 tzdata unzip curl git-all -y -RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list -RUN apt-get update -RUN apt-get install mono-complete -y +RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list +.d/mono-xamarin.list +RUN apt-get update && apt-get install libcurl3 tzdata unzip curl git-all mono-complete -y && apt-get -yqq clean RUN cp /usr/share/zoneinfo/GMT /etc/localtime From fcdc1e7b7d0dfc20562fd72fa083dbe17a401a67 Mon Sep 17 00:00:00 2001 From: Ben Hall Date: Wed, 17 May 2017 16:33:48 +0100 Subject: [PATCH 3/4] Execute within same instruction otherwise file remains in image layer --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5fe6384c9e..35fa9a1b39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,7 @@ ARG GitVersionZip # Add GitVersion ADD ./releaseArtifacts/$GitVersionZip . -RUN unzip -d /usr/lib/GitVersion/ $GitVersionZip -RUN rm $GitVersionZip +RUN unzip -d /usr/lib/GitVersion/ $GitVersionZip && rm $GitVersionZip WORKDIR /usr/lib/GitVersion/ # Libgit2 can't resolve relative paths, patch to absolute path @@ -16,4 +15,4 @@ RUN sed -i 's|lib/linux/x86_64|/usr/lib/GitVersion/lib/linux/x86_64|g' /usr/lib/ RUN mkdir /repo VOLUME /repo -ENTRYPOINT ["mono", "./GitVersion.exe", "/repo"] \ No newline at end of file +ENTRYPOINT ["mono", "./GitVersion.exe", "/repo"] From f2f52224ed447fc0f6abcdf60eac2b263751d04a Mon Sep 17 00:00:00 2001 From: Ben Hall Date: Wed, 17 May 2017 17:10:42 +0100 Subject: [PATCH 4/4] Update Dockerfile --- src/DockerBase/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/DockerBase/Dockerfile b/src/DockerBase/Dockerfile index a06ff91051..5007f41f9d 100644 --- a/src/DockerBase/Dockerfile +++ b/src/DockerBase/Dockerfile @@ -5,7 +5,6 @@ MAINTAINER GitTools Maintainers # Wheezy doesn't support glibc 2.15 which libgit2sharp requires # So we are going to install mono on ubuntu instead RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list -.d/mono-xamarin.list +RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list RUN apt-get update && apt-get install libcurl3 tzdata unzip curl git-all mono-complete -y && apt-get -yqq clean RUN cp /usr/share/zoneinfo/GMT /etc/localtime