Updating docker-compose with new single node container.

docker-compose.yml

@@ -26,6 +26,24 @@ services:
     entrypoint: /bin/sh -c newsblur_web/entrypoint.sh
     volumes: 
       - app-files:/srv/newsblur
+
+  newsblur_node:
+    image: newsblur/newsblur_node:latest
+    container_name: node
+    environment:
+      - NODE_ENV=docker
+      - MONGODB_PORT=29019
+    command: node newsblur.js
+    restart: unless-stopped
+    stop_signal: HUP
+    depends_on: 
+      - db_mongo
+      - db_postgres
+      - db_redis
+    ports:
+      - 8008:8008
+    volumes: 
+      - node-files:/srv
   
   nginx:
     container_name: nginx
@@ -34,14 +52,11 @@ services:
       - 81:81
     depends_on:
       - newsblur_web
-      - favicons
+      - newsblur_node
       - db_postgres
       - db_redis
       - db_mongo
       - db_elasticsearch
-      - original_pages
-      - original_text
-      - node_websocket
     environment: 
       - DOCKERBUILD=True
     volumes:
@@ -91,21 +106,6 @@ services:
     command: mongod --smallfiles --port 29019
     volumes:
       - ./docker/volumes/db_mongo:/data/db
-
-  newsblur_node:
-    image: newsblur/newsblur_node
-    container_name: node
-    environment:
-      - NODE_ENV=development
-      - MONGODB_PORT=29019
-    command: node newsblur.js
-    stop_signal: HUP
-    depends_on: 
-      - db_postgres
-    ports:
-      - 8008:8008
-    volumes: 
-      - node-files:/srv
   
   celerybeat:
     container_name: celerybeat

docker/nginx/nginx.local.conf

@@ -1,12 +1,3 @@
-upstream app_server {
-    server newsblur_web:8000 fail_timeout=10 max_fails=3 ;
-}
-
-upstream icon_server {
-    # this is node favicons
-    server favicons:3030 fail_timeout=2 max_fails=3;
-    server newsblur_web:8000 backup;
-}
 
 
 server {
@@ -115,24 +106,4 @@ server {
         include fastcgi_params;
     }
 
-    location ^~ /rss_feeds/icon/ {
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $http_host;
-        proxy_redirect off;
-        
-        proxy_pass http://icon_server;
-    }
-    
-    location / {
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $http_host;
-        proxy_redirect off;
-
-        if (!-f $request_filename) {
-            proxy_pass http://app_server;
-            break;
-        }
-    }
-
 }

node/original_page.coffee

@@ -5,7 +5,7 @@ mkdirp = require 'mkdirp'
 log    = require './log.js'
 
 original_page = (app) =>
-    DEV = process.env.NODE_ENV == 'development'
+    DEV = process.env.NODE_ENV == 'development' || process.env.NODE_ENV == 'docker'
 
     DB_PATH = if DEV then 'originals' else '/srv/originals'
 

node/original_page.js

@@ -14,7 +14,7 @@
 
   original_page = (app) => {
     var DB_PATH, DEV, splitFeedId;
-    DEV = process.env.NODE_ENV === 'development';
+    DEV = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'docker';
     DB_PATH = DEV ? 'originals' : '/srv/originals';
     app.use(busboy());
     app.get(/^\/original_page\/(\d+)\/?/, (req, res) => {

node/original_text.coffee

@@ -2,11 +2,11 @@ Mercury = require('@postlight/mercury-parser')
 log    = require './log.js'
 
 original_text = (app) =>
-    DEV = process.env.NODE_ENV == 'development'
+    DEV = process.env.NODE_ENV == 'development' || process.env.NODE_ENV == 'docker'
 
     log.debug "Starting NewsBlur Original Text Fetcher / Mercury Parser..."
     if !DEV and !process.env.NODE_ENV
-        log.debug "Specify NODE_ENV=<development,production>"
+        log.debug "Specify NODE_ENV=<development,docker,production>"
         return
     else if DEV
         log.debug "Running as development server"

node/original_text.js

@@ -8,10 +8,10 @@
 
   original_text = (app) => {
     var DEV;
-    DEV = process.env.NODE_ENV === 'development';
+    DEV = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'docker';
     log.debug("Starting NewsBlur Original Text Fetcher / Mercury Parser...");
     if (!DEV && !process.env.NODE_ENV) {
-      log.debug("Specify NODE_ENV=<development,production>");
+      log.debug("Specify NODE_ENV=<development,docker,production>");
       return;
     } else if (DEV) {
       log.debug("Running as development server");

node/unread_counts.coffee

@@ -6,7 +6,7 @@ unread_counts = (server) =>
     ENV_DEV = process.env.NODE_ENV == 'development'
     ENV_PROD = process.env.NODE_ENV == 'production'
     ENV_DOCKER = process.env.NODE_ENV == 'docker'
-    REDIS_SERVER = "redis"
+    REDIS_SERVER = "db_redis"
     if ENV_DEV
         REDIS_SERVER = 'localhost'
     else if ENV_PROD

node/unread_counts.js

@@ -13,7 +13,7 @@
     ENV_DEV = process.env.NODE_ENV === 'development';
     ENV_PROD = process.env.NODE_ENV === 'production';
     ENV_DOCKER = process.env.NODE_ENV === 'docker';
-    REDIS_SERVER = "redis";
+    REDIS_SERVER = "db_redis";
     if (ENV_DEV) {
       REDIS_SERVER = 'localhost';
     } else if (ENV_PROD) {