Merge branch 'master' into stable
This commit is contained in:
@@ -1,11 +1,9 @@
|
|||||||
## Introduction
|
## Introduction
|
||||||
This is a Dockerfile to build a container image for nginx and php-fpm, with the ability to pull website code from git. The container can also use environment variables to configure your web application using the templating detailed in the special features section.
|
This is a Dockerfile to build a container image for nginx and php-fpm, with the ability to pull website code from git. The container can also use environment variables to configure your web application using the templating detailed in the special features section.
|
||||||
|
|
||||||
### Git reposiory
|
### Git reposiory
|
||||||
The source files for this project can be found here: [https://github.com/ngineered/nginx-php-fpm](https://github.com/ngineered/nginx-php-fpm)
|
The source files for this project can be found here: [https://github.com/ngineered/nginx-php-fpm](https://github.com/ngineered/nginx-php-fpm)
|
||||||
|
|
||||||
If you have any improvements please submit a pull request.
|
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/)
|
||||||
|
|
||||||
|
|||||||
4
start.sh
4
start.sh
@@ -1,5 +1,9 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Disable Strict Host checking for non interactive git clones
|
||||||
|
|
||||||
|
echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /root/.ssh/config
|
||||||
|
|
||||||
# Pull down code form git for our site!
|
# Pull down code form git for our site!
|
||||||
if [ ! -z "$GIT_REPO" ]; then
|
if [ ! -z "$GIT_REPO" ]; then
|
||||||
rm /usr/share/nginx/html/*
|
rm /usr/share/nginx/html/*
|
||||||
|
|||||||
Reference in New Issue
Block a user