Skip to content

Commit

Permalink
Merge pull request kiswa#279 from jersou/dev
Browse files Browse the repository at this point in the history
update Dockerfile to match installation guide
  • Loading branch information
kiswa committed Apr 29, 2016
2 parents 2546120 + 1bd9907 commit ef90f2a
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM ubuntu:trusty
MAINTAINER Alex van den Hoogen <[email protected]>

RUN apt-get update && \
apt-get install -yq --no-install-recommends git wget nginx php5-fpm php5-sqlite sqlite3 ca-certificates pwgen && \
apt-get install -yq --no-install-recommends git wget nginx php5-fpm php5-sqlite sqlite3 ca-certificates pwgen php5-cli && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand All @@ -15,8 +15,11 @@ RUN echo "cgi.fix_pathinfo = 0;" >> /etc/php5/fpm/php.ini && \
RUN git clone https://github.com/kiswa/TaskBoard.git /var/www && \
chmod 777 $(find /var/www -type d)

RUN cd /var/www/ && ./build/composer.phar install

ADD nginx.conf /etc/nginx/sites-available/default

EXPOSE 80

CMD service php5-fpm start && nginx
CMD service php5-fpm start && nginx

0 comments on commit ef90f2a

Please sign in to comment.