Upgrade the Docker setup and dependencies

This commit is contained in:
Kévin Dunglas
2017-06-12 10:21:33 +02:00
parent 10b49ace3d
commit df6286b2e9
16 changed files with 147 additions and 68 deletions

View File

@@ -0,0 +1,8 @@
**/*.log
**/*.md
**/._*
**/.DS_Store
**/.gitignore
**/Thumbs.db
.dockerignore
Dockerfile

3
docker/nginx/Dockerfile Normal file
View File

@@ -0,0 +1,3 @@
FROM nginx:1.11-alpine
COPY conf.d /etc/nginx/conf.d/

View File

@@ -1,12 +1,13 @@
server {
root /srv/api-platform/web;
root /srv/app/web;
resolver 127.0.0.11;
location / {
# try to serve file directly, fallback to app.php
try_files $uri /index.php$is_args$args;
}
location ~ ^/index\.php(/|$) {
fastcgi_pass php:9000;
fastcgi_pass app:9000;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
include fastcgi_params;
# When you are using symlinks to link the document root to the
@@ -29,7 +30,4 @@ server {
location ~ \.php$ {
return 404;
}
error_log /var/log/nginx/app_error.log;
access_log /var/log/nginx/app_access.log;
}