OrgGo
/
Mainflux.mainflux
mirror of https://github.com/mainflux/mainflux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed docker composition (#187) 

Signed-off-by: nmarcetic <n.marcetic86@gmail.com>
This commit is contained in:
Nikola Marčetić 2018-03-16 13:52:51 +01:00 committed by Dejan Mijić
parent 8876acbfec
commit bf5d1544b6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/docker-compose.yml
View File

@ -39,6 +39,8 @@ services:
POSTGRES_USER: mainflux POSTGRES_USER: mainflux
POSTGRES_PASSWORD: mainflux POSTGRES_PASSWORD: mainflux
POSTGRES_DB: mainflux POSTGRES_DB: mainflux
ports:
- "5432:5432"
manager: manager:
image: mainflux/manager:latest image: mainflux/manager:latest
@ -89,3 +91,5 @@ services:
MQTT_ADAPTER_NATS_URL: "nats://nats:4222" MQTT_ADAPTER_NATS_URL: "nats://nats:4222"
AUTH_URL: "http://manager" AUTH_URL: "http://manager"
AUTH_PORT: 8180 AUTH_PORT: 8180
ports:
- "1883:1883"

7
docker/nginx.conf
View File

@ -69,9 +69,10 @@ http {
server { server {
listen 80 default_server; listen 80 default_server;
listen [::]:80 default_server; listen [::]:80 default_server;
server_name localhost; server_name localhost;
return 302 https://$server_name$request_uri; access_log off;
error_log off;
return 301 https://$server_name$request_uri;
} }
# HTTPS # HTTPS
@ -132,7 +133,7 @@ http {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://docker-manager/; proxy_pass http://docker-manager;
# Allow OPTIONS method CORS # Allow OPTIONS method CORS
if ($request_method = OPTIONS ) { if ($request_method = OPTIONS ) {