Skip to content

Commit

Permalink
fix conf nginx and add docker-compose.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
rtancman committed Apr 30, 2016
1 parent d5cbef2 commit 24a5d2b
Show file tree
Hide file tree
Showing 21 changed files with 227 additions and 70 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.log
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Dockerfile links
- [docker-symfony:php-5.5](https://github.com/rtancman/docker-symfony/tree/master/php-5.5)
- [docker-symfony:latest - php-5.6](https://github.com/rtancman/docker-symfony/tree/master/php-5.6)
- [docker-symfony:php-7](https://github.com/rtancman/docker-symfony/tree/master/php-7)

# Docker image to run symfony using
- nginx
Expand Down
3 changes: 1 addition & 2 deletions php-5.5/app/index.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<h1>Hello World!!!</h1>
<h3>PHP Version <?php echo phpversion() ?></h3>
<a href="#">Static HTML Page</a>
<?php echo phpinfo() ?>
19 changes: 19 additions & 0 deletions php-5.5/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
nginx:
image: nginx:1.9.5
ports:
- "80:80"
- "443:443"
links:
- php
- memcached
volumes:
- ./app:/var/www/html/dev
- ./nginx/conf.d/app.conf:/etc/nginx/conf.d/default.conf
- ./nginx/logs:/var/log/nginx
memcached:
image: memcached
php:
image: rtancman/docker-symfony:php-7
volumes:
- ./app:/var/www/html/dev
- ./phpfpm-foreground:/usr/local/bin/phpfpm-foreground
28 changes: 28 additions & 0 deletions php-5.5/nginx/conf.d/app.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
upstream phpfcgi {
server php:9000;
}

server {
listen 80;
server_name localhost;
root /var/www/html/dev;

index index.php;

location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
if (!-f $document_root$fastcgi_script_name) {
return 404;
}

include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
fastcgi_param HTTPS off;


fastcgi_pass phpfcgi;
fastcgi_index index.php;
}
}
26 changes: 26 additions & 0 deletions php-5.5/nginx/conf.d/appssl.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
server {
listen 443;
server_name localhost;
root /var/www/html/dev;

ssl on;
ssl_certificate /etc/nginx/ssl/nginx.crt;
ssl_certificate_key /etc/nginx/ssl/nginx.key;

index index.php;

location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
if (!-f $document_root$fastcgi_script_name) {
return 404;
}

include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;

fastcgi_pass phpfcgi;
fastcgi_index index.php;
}
}
1 change: 1 addition & 0 deletions php-5.5/nginx/logs/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.gitkeep
5 changes: 0 additions & 5 deletions php-5.5/phpfpm-foreground
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
#!/bin/bash
set -e
xdebug.remote_port=9004 \n\
xdebug.remote_host=X.X.X.X \n\

echo -e "xdebug.remote_port=9004 \n\
xdebug.remote_host=X.X.X.X" >> /usr/local/etc/php/conf.d/xdebug.ini ;

exec php-fpm
3 changes: 1 addition & 2 deletions php-5.6/app/index.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<h1>Hello World!!!</h1>
<h3>PHP Version <?php echo phpversion() ?></h3>
<a href="#">Static HTML Page</a>
<?php echo phpinfo() ?>
19 changes: 19 additions & 0 deletions php-5.6/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
nginx:
image: nginx:1.9.5
ports:
- "80:80"
- "443:443"
links:
- php
- memcached
volumes:
- ./app:/var/www/html/dev
- ./nginx/conf.d/app.conf:/etc/nginx/conf.d/default.conf
- ./nginx/logs:/var/log/nginx
memcached:
image: memcached
php:
image: rtancman/docker-symfony:php-7
volumes:
- ./app:/var/www/html/dev
- ./phpfpm-foreground:/usr/local/bin/phpfpm-foreground
28 changes: 28 additions & 0 deletions php-5.6/nginx/conf.d/app.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
upstream phpfcgi {
server php:9000;
}

server {
listen 80;
server_name localhost;
root /var/www/html/dev;

index index.php;

location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
if (!-f $document_root$fastcgi_script_name) {
return 404;
}

include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
fastcgi_param HTTPS off;


fastcgi_pass phpfcgi;
fastcgi_index index.php;
}
}
26 changes: 26 additions & 0 deletions php-5.6/nginx/conf.d/appssl.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
server {
listen 443;
server_name localhost;
root /var/www/html/dev;

ssl on;
ssl_certificate /etc/nginx/ssl/nginx.crt;
ssl_certificate_key /etc/nginx/ssl/nginx.key;

index index.php;

location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
if (!-f $document_root$fastcgi_script_name) {
return 404;
}

include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;

fastcgi_pass phpfcgi;
fastcgi_index index.php;
}
}
1 change: 1 addition & 0 deletions php-5.6/nginx/logs/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.gitkeep
5 changes: 0 additions & 5 deletions php-5.6/phpfpm-foreground
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
#!/bin/bash
set -e
xdebug.remote_port=9004 \n\
xdebug.remote_host=X.X.X.X \n\

echo -e "xdebug.remote_port=9004 \n\
xdebug.remote_host=X.X.X.X" >> /usr/local/etc/php/conf.d/xdebug.ini ;

exec php-fpm
3 changes: 1 addition & 2 deletions php-7/app/index.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<h1>Hello World!!!</h1>
<h3>PHP Version <?php echo phpversion() ?></h3>
<a href="#">Static HTML Page</a>
<?php echo phpinfo() ?>
19 changes: 19 additions & 0 deletions php-7/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
nginx:
image: nginx:1.9.5
ports:
- "80:80"
- "443:443"
links:
- php
- memcached
volumes:
- ./app:/var/www/html/dev
- ./nginx/conf.d/app.conf:/etc/nginx/conf.d/default.conf
- ./nginx/logs:/var/log/nginx
memcached:
image: memcached
php:
image: rtancman/docker-symfony:php-7
volumes:
- ./app:/var/www/html/dev
- ./phpfpm-foreground:/usr/local/bin/phpfpm-foreground
49 changes: 0 additions & 49 deletions php-7/nginx/app.conf

This file was deleted.

28 changes: 28 additions & 0 deletions php-7/nginx/conf.d/app.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
upstream phpfcgi {
server php:9000;
}

server {
listen 80;
server_name localhost;
root /var/www/html/dev;

index index.php;

location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
if (!-f $document_root$fastcgi_script_name) {
return 404;
}

include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
fastcgi_param HTTPS off;


fastcgi_pass phpfcgi;
fastcgi_index index.php;
}
}
26 changes: 26 additions & 0 deletions php-7/nginx/conf.d/appssl.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
server {
listen 443;
server_name localhost;
root /var/www/html/dev;

ssl on;
ssl_certificate /etc/nginx/ssl/nginx.crt;
ssl_certificate_key /etc/nginx/ssl/nginx.key;

index index.php;

location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
if (!-f $document_root$fastcgi_script_name) {
return 404;
}

include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;

fastcgi_pass phpfcgi;
fastcgi_index index.php;
}
}
1 change: 1 addition & 0 deletions php-7/nginx/logs/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.gitkeep
5 changes: 0 additions & 5 deletions php-7/phpfpm-foreground
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
#!/bin/bash
set -e
xdebug.remote_port=9004 \n\
xdebug.remote_host=X.X.X.X \n\

echo -e "xdebug.remote_port=9004 \n\
xdebug.remote_host=X.X.X.X" >> /usr/local/etc/php/conf.d/xdebug.ini ;

exec php-fpm

0 comments on commit 24a5d2b

Please sign in to comment.