Skip to content

Commit

Permalink
Added latest version of Bludit to Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
dignajar committed Mar 12, 2017
1 parent 1dc0dc5 commit 8fb00de
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM debian:jessie
MAINTAINER Diego
MAINTAINER Diego Najar

# Variables
ENV NGINX_VERSION 1.10.1-1~jessie
ENV NGINX_VERSION 1.11.10-1~jessie
ENV nginx_conf /etc/nginx/nginx.conf
ENV php_conf /etc/php5/fpm/php.ini
ENV fpm_conf /etc/php5/fpm/php-fpm.conf
ENV fpm_pool /etc/php5/fpm/pool.d/www.conf
ENV bludit_zip https://s3.amazonaws.com/bludit-s3/bludit-builds/bludit-1-4.zip
ENV bludit_zip https://s3.amazonaws.com/bludit-s3/bludit-builds/bludit_latest.zip

# Packages installation
RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 && \
Expand All @@ -23,6 +23,7 @@ RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC64107
nginx-module-njs \
gettext-base \
php5-fpm \
php5-gd \
unzip \
axel \
supervisor
Expand Down
10 changes: 6 additions & 4 deletions conf/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ server {

root /usr/share/nginx/html;

location / {
index index.php;
}

location ~ \.php$ {
include fastcgi_params;
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
}

# Route to index.php
if (!-f $request_filename) {
rewrite ^/(.*) /index.php break;
}

}

0 comments on commit 8fb00de

Please sign in to comment.