Browse Source

Phase III Task 2

master
Yutsuo 7 years ago
parent
commit
77baafa17e
  1. 8
      docker-compose.yml
  2. 12
      nginx/nginx.conf
  3. 2
      node/app.js

8
docker-compose.yml

@ -16,10 +16,10 @@ services:
container_name: nginx2 container_name: nginx2
restart: always restart: always
image: nginx image: nginx
ports: expose:
- "8080:8000" - "80"
environment: networks:
- NGINX_PORT=8000 - network_1
app: app:
container_name: app container_name: app
# depends_on: # depends_on:

12
nginx/nginx.conf

@ -4,12 +4,8 @@ events { worker_connections 1024; }
http { http {
sendfile on;
upstream app { upstream app {
server app:3001; server app:3001;
server prometheus:9090;
server grafana:3000;
} }
server { server {
@ -18,13 +14,5 @@ http {
location / { location / {
proxy_pass http://app; proxy_pass http://app;
} }
# location /prometheus {
# proxy_pass http://prometheus;
# }
# location /grafana {
# proxy_pass http://grafana;
# }
} }
} }

2
node/app.js

@ -137,7 +137,7 @@ app.post('/info/add/:name', function(req, res){
res.send('color ' + req.params.name + ' added to database'); res.send('color ' + req.params.name + ' added to database');
}); });
// connectWithRetry(); connectWithRetry();
app.listen(3001, () => { app.listen(3001, () => {
console.log('Server running on port 3001'); console.log('Server running on port 3001');

Loading…
Cancel
Save