Skip to content

Improvements to Dockerfile #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 20, 2017
Merged

Improvements to Dockerfile #1219

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75fc4e2
Use fixed version of Ubuntu to prevent breaking changes
BenHall May 17, 2017
3259623
Combine to a single RUN command and clean cache afterwards
BenHall May 17, 2017
fcdc1e7
Execute within same instruction otherwise file remains in image layer
BenHall May 17, 2017
f2f5222
Update Dockerfile
BenHall May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
ENTRYPOINT ["mono", "./GitVersion.exe", "/repo"]
10 changes: 4 additions & 6 deletions src/DockerBase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
FROM ubuntu
FROM ubuntu:16.04

MAINTAINER GitTools Maintainers <[email protected]>

# 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be on a new line?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good spot. No, it shouldn't. I copied and pasted from my terminal window

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