Merge branch 'annex_in_docker' into 'master'

Add git-annex to the docker container.

Fixes gitlab-org/omnibus-gitlab#1215

See merge request !723
This commit is contained in:
Marin Jankovski 2016-04-07 18:04:26 +00:00
commit c1fdc4ff05
2 changed files with 3 additions and 1 deletions

View File

@ -14,6 +14,7 @@ omnibus-gitlab repository.
- Enable Git LFS by default (Ben Bodenmiller) 22345799
- Updated how we detect when to update the :latest and :rc docker build tags cb3af445
- Disable automatic git gc 8ed13f4b
- Add git-annex to the docker image
8.6.4

View File

@ -10,7 +10,8 @@ RUN apt-get update -q \
apt-transport-https \
vim \
nano \
patch
patch \
git-annex
# Copy assets
COPY RELEASE /