SchultesDev/nginx-php-fpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various fixes and updates

Browse Source
This commit is contained in:
Ric Harvey
2016-01-17 22:35:36 +00:00
parent a788d25a96
commit cc2ff25052
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ubuntu:14.04.2 FROM ubuntu:14.04.3
MAINTAINER Ric Harvey <ric@ngineered.co.uk> MAINTAINER Ric Harvey <ric@ngineered.co.uk>
# Surpress Upstart errors/warning # Surpress Upstart errors/warning
@@ -51,10 +51,7 @@ RUN sed -i -e "s/;listen.mode = 0660/listen.mode = 0750/g" /etc/php5/fpm/pool.d/
find /etc/php5/cli/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g' {} \; find /etc/php5/cli/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g' {} \;
# mycrypt conf # mycrypt conf
RUN ln -s /etc/php5/conf.d/mcrypt.ini /etc/php5/mods-available/mcrypt.ini
RUN php5enmod mcrypt RUN php5enmod mcrypt
RUN service php5-fpm restart
RUN service nginx restart
# nginx site conf # nginx site conf
RUN rm -Rf /etc/nginx/conf.d/* && \ RUN rm -Rf /etc/nginx/conf.d/* && \

21
README.md
View File

@@ -7,10 +7,14 @@ If you have any improvements please submit a pull request.
### Docker hub repository ### Docker hub repository
The Docker hub build can be found here: [https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/](https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/) The Docker hub build can be found here: [https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/](https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/)
## Nginx Versions ## Nginx Version
- Mainline Version: **1.9.9** - Mainline Version: **1.9.9**
- Stable Version: **1.8.0**
- *Latest = Mainline Version* ## PHP Version
- PHP: **5.5.9+dfsg-1ubuntu4.14**
## Ubuntu Version
- Ubuntu Trusty: **14.04.03**
## Installation ## Installation
Pull the image from the docker index rather than downloading the git repo. This prevents you having to build the image on every docker host. Pull the image from the docker index rather than downloading the git repo. This prevents you having to build the image on every docker host.
@@ -18,16 +22,7 @@ Pull the image from the docker index rather than downloading the git repo. This
``` ```
docker pull richarvey/nginx-php-fpm:latest docker pull richarvey/nginx-php-fpm:latest
``` ```
To pull the Stable Version:
```
docker pull richarvey/nginx-php-fpm:stable
```
To pull the Mainline Version:
```
docker pull richarvey/nginx-php-fpm:mainline
```
## Running ## Running
To simply run the container: To simply run the container:
@@ -151,10 +146,12 @@ database_pass = $$_MYSQL_PASS_$$
``` ```
### Skip Templating ### Skip Templating
In order to speed up install time if templating is not required and you have a lot of files in your web root that you don't wish to be scanned, simply include the flag below: In order to speed up install time if templating is not required and you have a lot of files in your web root that you don't wish to be scanned, simply include the flag below:
```-e TEMPLATE_NGINX_HTML=0``` ```-e TEMPLATE_NGINX_HTML=0```
### Display Errors ### Display Errors
If you want to display PHP errors on screen for debugging use this feature: If you want to display PHP errors on screen for debugging use this feature:
```-e ERRORS=1``` ```-e ERRORS=1```
### Template anything ### Template anything