archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Include git and vim in docker images

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-07-29 11:35:19 +02:00
parent ed863447cf
commit 81b5483294
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/dev/Dockerfile
View File

@ -5,6 +5,7 @@ RUN apt-get update && apt-get install -y \
python \ python \
python-dev \ python-dev \
python-pip \ python-pip \
vim \
nano \ nano \
zlib1g-dev \ zlib1g-dev \
libjpeg-dev \ libjpeg-dev \
@ -12,7 +13,8 @@ python-crypto \
python-openssl \ python-openssl \
libssl-dev \ libssl-dev \
libffi-dev \ libffi-dev \
software-properties-common software-properties-common \
git
RUN add-apt-repository ppa:mc3man/trusty-media \ RUN add-apt-repository ppa:mc3man/trusty-media \
&& apt-get update && apt-get install -y \ && apt-get update && apt-get install -y \

3
docker/pro/Dockerfile
View File

@ -16,7 +16,8 @@ libffi-dev \
software-properties-common \ software-properties-common \
apache2-mpm-event \ apache2-mpm-event \
libapache2-mod-wsgi \ libapache2-mod-wsgi \
libapache2-mod-xsendfile libapache2-mod-xsendfile \
git
RUN add-apt-repository ppa:mc3man/trusty-media \ RUN add-apt-repository ppa:mc3man/trusty-media \
&& apt-get update && apt-get install -y \ && apt-get update && apt-get install -y \