Merge branch 'master' of github.com:snipe/snipe-it
This commit is contained in:
commit
f371c5fd62
1 changed files with 4 additions and 2 deletions
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:trusty
|
||||
FROM debian:jessie-slim
|
||||
MAINTAINER Brady Wetherington <uberbrady@gmail.com>
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
|
@ -13,7 +13,9 @@ patch \
|
|||
curl \
|
||||
vim \
|
||||
git \
|
||||
mysql-client
|
||||
mysql-client \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
RUN php5enmod mcrypt
|
||||
RUN php5enmod gd
|
||||
|
|
Loading…
Add table
Reference in a new issue