Skip to content

Commit 2ae0afb

Browse files
committed
cleanup script files and readme
1 parent 8e4de44 commit 2ae0afb

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</p>
66
-----
77
# nginx-php56
8-
A Nginx + PHP 5.6 (FPM) Base container. This container is based on the excellent [phusion/baseimage-docker](https://github.com/phusion/baseimage-docker) base container. You can find the Docker automated build [here](https://registry.hub.docker.com/u/mstrazds/nginx-php56/).
8+
A Nginx + PHP 5.6 (FPM) Base container. This container is based on the excellent [phusion/baseimage-docker](https://github.com/phusion/baseimage-docker) base container. You can find the docker automated build [here](https://registry.hub.docker.com/u/mstrazds/nginx-php56/).
99

1010
### Services
1111
All services are defined and managed using the phusion/baseimage methodology. Logs are output using syslog and can be accessed using ``docker logs {container}``.
@@ -25,10 +25,10 @@ The following folder is specified as a volume:
2525

2626
``/var/www/``
2727

28-
Note that the ``/var/www/public`` is actually the root folder for serving PHP files for your web server. Having a layer back for the volume allows a bit more control over what files are visible.
28+
Note that the ``/var/www/public`` is the root folder for serving PHP files for your web server. Having a layer (folder) back for the volume allows a bit more flexibility on file visibility.
2929

3030
### Build Folder (within repo)
31-
The build folder contains the nginx config files as well as php-fpm settings and a setup.sh file that offloads tasks from the Dockerfile.
31+
Contains nginx config files as well as php-fpm settings. Also include setup.sh file that offloads tasks from the Dockerfile to reduce layers.
3232

3333
### Notes
3434
Remember that PHP-FPM doesn not respect environment variables passed in the traditional manner. You will need to explicitly state what your variables are within the ``/etc/php5/fpm/pool.d/www.conf`` file.

build/default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
server {
2+
23
listen 80;
3-
#listen [::]:80 ipv6only=on default_server;
44

55
root /var/www/public/;
66
index index.html index.htm index.php;

build/setup.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#!/usr/bin/env bash
22

3-
# Run Node.js output versions
4-
node -v
5-
npm -v
6-
73
##-------------------------------------------------------
84
# UPDATE CONFIG FILES
95
##-------------------------------------------------------
@@ -21,16 +17,10 @@ sed -i '/^;listen.mode = .*/alisten.mode = 0660' /etc/php5/fpm/pool.d/www.conf
2117
sed -i '/^listen.mode = .*/alisten.owner = www-data' /etc/php5/fpm/pool.d/www.conf
2218
sed -i '/^listen.mode = .*/alisten.group = www-data' /etc/php5/fpm/pool.d/www.conf
2319

24-
# Dynamic PHP environment variables for php-fpm
25-
#&#&
26-
2720
##-------------------------------------------------------
2821
# UPDATE FILES AND FOLDERS
2922
##-------------------------------------------------------
3023

3124
# Add required php5-fpm folders
3225
mkdir -p /var/run/php5-fpm && chown -R www-data:www-data /var/run/php5-fpm
3326
mkdir -p /var/log/php5-fpm && chown -R www-data:www-data /var/log/php5-fpm
34-
35-
# Remove existing www folder
36-
# rm -fr /var/www

0 commit comments

Comments
 (0)