Commit da35f762 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'docker-update' into 'master'

apt-add-repository is missing on docker

but used in Vagrantfile from some point

And adding rsync to save vagrant execution time
(vagrant tries to install it)

See merge request !95
parents 52905776 4849f557
......@@ -2,7 +2,7 @@ FROM ubuntu:trusty
MAINTAINER Gitlab.com
RUN apt-get update ;\
apt-get -y install openssh-server supervisor ;\
apt-get -y install openssh-server supervisor software-properties-common rsync ;\
rm -rf /var/lib/apt/lists/* ;\
mkdir /var/run/sshd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment