diff --git a/Dockerfile b/Dockerfile index 7b18c56..b2c90ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,21 @@ -FROM debian:jessie +FROM ubuntu MAINTAINER Larry Price ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && apt-get install git postgresql sendmail sendmail-bin wkhtmltopdf supervisor apache2 \ - libapache2-mod-php5 php5-pgsql php5-curl php5-xmlrpc -y --force-yes +RUN /usr/bin/lsb_release -a +RUN apt-get update && apt-get install git postgresql sendmail sendmail-bin supervisor apache2 libjpeg-turbo8-dev fontconfig \ + libapache2-mod-php5 php5-pgsql php5-curl php5-xmlrpc xfonts-75dpi openssl build-essential \ + xorg libssl-dev wget -y --force-yes +RUN wget http://downloads.sourceforge.net/wkhtmltopdf/wkhtmltox-0.12.2.1_linux-trusty-amd64.deb +RUN dpkg -i wkhtmltox-0.12.2.1_linux-trusty-amd64.deb +RUN cp -f /usr/local/bin/wkhtmltopdf /usr/bin/wkhtmltopdf RUN service postgresql start RUN git clone https://github.com/francoisjacquet/rosariosis.git /usr/src/rosariosis WORKDIR /usr/src/rosariosis -RUN git checkout 2.7.4 +RUN git checkout v2.8.12 RUN rm -rf /var/www/html && mkdir -p /var/www && ln -s /usr/src/rosariosis/ /var/www/html && chmod 777 /var/www/html diff --git a/README.md b/README.md index 4f8c76b..17d53b8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ RosarioSIS uses a Postgres database: ``` bash $ docker run --name rosariodb -d postgres:9.4 -$ docker run -d -p 80:80 --link rosariodb:rosariodb larryprice/docker-rosario +$ docker run -d -p 80:80 --name rosariosis --link rosariodb:rosariodb rosariosis ``` Port 80 will be exposed, so you can visit `localhost` to get started. The default username is `admin` and the default password is `admin`.