Commit 6a908812 authored by Mark Harding's avatar Mark Harding
Browse files

(chore): composer latest

parent 6ce15198
......@@ -4,7 +4,7 @@ server {
index index.php index.html;
server_name _;
root /var/www/Minds/front/public;
error_log /dev/stdout info;
if ($host = 'minds.com' ) {
......@@ -18,8 +18,8 @@ server {
sendfile off;
location / {
try_files $uri $uri/ @rewrite;
port_in_redirect off;
}
location ~ ^(/api|/fs|/icon|/carousel) {
......@@ -68,8 +68,6 @@ server {
# pass the PHP scripts to FastCGI server listening on socket
location ~ \.php$ {
try_files $uri =404;
add_header X-Cache $upstream_cache_status;
add_header No-Cache $no_cache;
......@@ -81,6 +79,9 @@ server {
fastcgi_pass php-fpm:9000;
fastcgi_index index.php;
fastcgi_buffers 64 32k;
fastcgi_buffer_size 64k;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME /var/www/Minds/engine/index.php;
fastcgi_param PATH_INFO $fastcgi_path_info;
......
......@@ -40,5 +40,7 @@ http {
fastcgi_cache_key "$scheme$request_method$host$request_uri";
fastcgi_ignore_headers Cache-Control Expires Set-Cookie;
merge_slashes on;
include /etc/nginx/conf.d/*.conf;
}
......@@ -3,11 +3,14 @@ version: "2.2"
services:
cassandra:
image: cassandra:3.11
image: cassandra:3.11.1
environment:
- CASSANDRA_START_RPC=true
networks:
- app
volumes:
- "./cassandra:/var/lib/cassandra"
- "./logs:/var/log"
mongo:
image: mongo:3.4
......@@ -28,7 +31,7 @@ services:
redis:
image: redis:4.0-alpine
mem_limit: 256MB # keep an eye
mem_limit: 100MB # keep an eye
networks:
- app
......@@ -43,9 +46,9 @@ services:
dockerfile: ./containers/php-fpm/Dockerfile
depends_on:
- cassandra
- mongo
- elasticsearch
- rabbitmq
#- mongo
#- elasticsearch
#- rabbitmq
- redis
networks:
- app
......@@ -88,6 +91,15 @@ services:
## The following is for development environments only. Comment out on production. ##
- "./front/:/var/www/Minds/front"
installer:
build:
context: ./engine
dockerfile: ./containers/installer/Dockerfile
depends_on:
- nginx #this will then load in everything else
volumes:
- "./engine/:/var/www/Minds/engine"
networks:
app:
driver: "bridge"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment