Fix nginx config and package.json + update README

Author: Ric Harvey

Dockerfile

@@ -46,6 +46,9 @@ ADD ./package.json /usr/share/nginx/html/package.json
 RUN mkdir /usr/share/nginx/html/public
 Add ./ngineered.png /usr/share/nginx/html/public/ngineered.png
 
+# Add log directories
+RUN mkdir /var/log/node/
+
 # Supervisor Config
 RUN /usr/bin/easy_install supervisor
 RUN /usr/bin/easy_install supervisor-stdout

README.md

@@ -1,13 +1,13 @@
 ## Introduction
-This is a Dockerfile to build a container image for nginx and php-fpm, with the ability to pull website code from git. The container can also use environment variables to configure your web application using the templating detailed in the special features section.
+This is a Dockerfile to build a container image for nginx and nodejs, with the ability to pull website code from git. The container can also use environment variables to configure your web application using the templating detailed in the special features section.
 
 ### Git reposiory
-The source files for this project can be found here: [https://github.com/ngineered/nginx-php-fpm](https://github.com/ngineered/nginx-php-fpm)
+The source files for this project can be found here: [https://github.com/ngineered/nginx-nodejs](https://github.com/ngineered/nginx-nodejs)
 
 If you have any improvements please submit a pull request.
 
 ### Docker hub repository
-The Docker hub build can be found here: [https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/](https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/)
+The Docker hub build can be found here: [https://registry.hub.docker.com/u/richarvey/nginx-nodejs/](https://registry.hub.docker.com/u/richarvey/nginx-nodejs/)
 
 ## Nginx Versions
 - Mainline Version: **1.7.9**
@@ -18,25 +18,60 @@ The Docker hub build can be found here: [https://registry.hub.docker.com/u/richa
 Pull the image from the docker index rather than downloading the git repo. This prevents you having to build the image on every docker host.
 
 ```
-docker pull richarvey/nginx-pfp-fpm:latest
+docker pull richarvey/nginx-nodejs:latest
 ```
 To pull the Stable Version:
 
 ```
-docker pull richarvey/nginx-pfp-fpm:stable
+docker pull richarvey/nginx-nodejs:stable
 ```
 ## Running
 To simply run the container:
 
 ```
-sudo docker run --name nginx -p 8080:80 -d richarvey/nginx-php-fpm
+sudo docker run --name nginx -p 8080:80 -d richarvey/nginx-nodejs
 ```
 You can then browse to http://<docker_host>:8080 to view the default install files.
+### Running your nodeJS app and default port
+The container will automatically run any file in the */usr/share/nginx/html* directory named server.js, so if you are pulling your own code from git be sure to name your application *server.js*.
+
+Nginx is set to listen for your application on port 3000 on the localhost. So make sure you set your node app to run on port 3000:
+
+```
+var server = app.listen(3000, function () {
+...
+```
+
+To view your application you can go to:
+```
+http://<docker_ip>:8080
+```
+### Serving Static Content from Nginx
+By placing files in the */usr/share/nginx/html/public* directory nginx will serve the static files directly. You can then browse the files directly:
+
+Example:
+```
+http://<docker_ip>:8080/public/ngineered.png
+```
 ### Volumes
 If you want to link to your web site directory on the docker host to the container run:
 
 ```
-sudo docker run --name nginx -p 8080:80 -v /your_code_directory:/usr/share/nginx/html -d richarvey/nginx-php-fpm
+sudo docker run --name nginx -p 8080:80 -v /your_code_directory:/usr/share/nginx/html -d richarvey/nginx-nodejs
+```
+### NPM
+To install npm dependancies simply create a package.json file int he route of your code. The example below install express 4.x
+
+```
+{
+  "name": "node-server-example",
+  "description": "Hello World App",
+  "version": "0.0.1",
+  "private": true,
+  "dependencies": {
+    "express": "4.x"
+  }
+}
 ```
 ### Pulling code from git
 One of the nice features of this container is its ability to pull code from a git repository with a couple of environmental variables passed at run time.
@@ -46,13 +81,13 @@ One of the nice features of this container is its ability to pull code from a gi
 To run the container and pull code simply specify the GIT_REPO URL including *git@* and then make sure you have a folder on the docker host with your id_rsa key stored in it:
 
 ```
-sudo docker run -e '[email protected]:ngineered/ngineered-website.git'  -v /opt/ngddeploy/:/root/.ssh -p 8080:80 -d richarvey/nginx-php-fpm
+sudo docker run -e '[email protected]:ngineered/ngineered-website.git'  -v /opt/ngddeploy/:/root/.ssh -p 8080:80 -d richarvey/nginx-nodejs
 ```
 
 To pull a repository and specify a branch add the GIT_BRANCH environment variable:
 
 ```
-sudo docker run -e '[email protected]:ngineered/ngineered-website.git' -e 'GIT_BRANCH=stage' -v /opt/ngddeploy/:/root/.ssh -p 8080:80 -d richarvey/nginx-php-fpm
+sudo docker run -e '[email protected]:ngineered/ngineered-website.git' -e 'GIT_BRANCH=stage' -v /opt/ngddeploy/:/root/.ssh -p 8080:80 -d richarvey/nginx-nodejs
 ```
 ### Linking
 Linking to containers also exposes the linked container environment variables which is useful for templating and configuring web apps.
@@ -84,15 +119,15 @@ MYSQL_PORT=tcp://172.17.0.236:3306
 To link the container launch like this:
 
 ```
-sudo docker run -e '[email protected]:ngineered/ngineered-website.git' -v /opt/ngddeploy/:/root/.ssh -p 8080:80 --link some-mysql:mysql -d richarvey/nginx-php-fpm
+sudo docker run -e '[email protected]:ngineered/ngineered-website.git' -v /opt/ngddeploy/:/root/.ssh -p 8080:80 --link some-mysql:mysql -d richarvey/nginx-nodejs
 ```
 ### Enabling SSL or Special Nginx Configs
 As with all docker containers its possible to link resources from the host OS to the guest. This makes it really easy to link in custom nginx default config files or extra virtual hosts and SSL enabled sites. For SSL sites first create a directory somewhere such as */opt/deployname/ssl/*. In this directory drop you SSL cert and Key in. Next create a directory for your custom hosts such as  */opt/deployname/sites-enabled*. In here load your custom default.conf file which references your SSL cert and keys at the location, for example:  */etc/nginx/ssl/xxxx.key* 
 
 Then start your container and connect these volumes like so:
 
 ```
-sudo docker run -e '[email protected]:ngineered/ngineered-website.git' -v /opt/ngddeploy/:/root/.ssh -v /opt/deployname/ssl:/etc/nginx/ssl -v /opt/deplyname/sites-enabled:/etc/nginx/sites-enabled -p 8080:80 --link some-mysql:mysql -d richarvey/nginx-php-fpm
+sudo docker run -e '[email protected]:ngineered/ngineered-website.git' -v /opt/ngddeploy/:/root/.ssh -v /opt/deployname/ssl:/etc/nginx/ssl -v /opt/deplyname/sites-enabled:/etc/nginx/sites-enabled -p 8080:80 --link some-mysql:mysql -d richarvey/nginx-nodejs
 ```
 
 ## Special Features
@@ -103,11 +138,9 @@ This container will automatically configure your web application if you template
 Example:
 
 ```
-<?php
 database_name = $$_MYSQL_ENV_MYSQL_DATABASE_$$;
 database_host = $$_MYSQL_PORT_3306_TCP_ADDR_$$;
 ...
-?>
 ```
 
 ### Using environment variables
@@ -116,7 +149,7 @@ If you want to link to an external MySQL DB and not using linking you can pass v
 Example:
 
 ```
-sudo docker run -e '[email protected]:ngineered/ngineered-website.git' -e 'GIT_BRANCH=stage' -e 'MYSQL_HOST=host.x.y.z' -e 'MYSQL_USER=username' -e 'MYSQL_PASS=password' -v /opt/ngddeploy/:/root/.ssh -p 8080:80 -d richarvey/nginx-php-fpm
+sudo docker run -e '[email protected]:ngineered/ngineered-website.git' -e 'GIT_BRANCH=stage' -e 'MYSQL_HOST=host.x.y.z' -e 'MYSQL_USER=username' -e 'MYSQL_PASS=password' -v /opt/ngddeploy/:/root/.ssh -p 8080:80 -d richarvey/nginx-nodejs
 ```
 
 This will expose the following variables that can be used to template your code.
@@ -129,12 +162,10 @@ MYSQL_PASS=password
 To use these variables in a template you'd do the following in your file:
 
 ```
-<?php
 database_host = $$_MYSQL_HOST_$$;
 database_user = $$_MYSQL_USER_$$;
 database_pass = $$_MYSQL_PASS_$$
 ...
-?>
 ```
 ### Template anything
 Yes ***ANYTHING***, any variable exposed by a linked container or the **-e** flag lets you template your config files. This means you can add redis, mariaDB, memcache or anything you want to your application very easily.

nginx-site.conf

@@ -18,24 +18,9 @@ server {
   	}
 
   	location /public {
-    	  root /usr/share/nginx/html/public;
+    	  root /usr/share/nginx/html;
   	}
 
-	#error_page 404 /404.html;
-
-	# redirect server error pages to the static page /50x.html
-	#
-	error_page 500 502 503 504 /50x.html;
-	location = /50x.html {
-		root /usr/share/nginx/html;
-	}
-
-        location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ {
-                access_log        off;
-                log_not_found     off;
-                expires           5d;
-        }
-
 	# deny access to . files, for security
 	#
 	location ~ /\. {

package.json

@@ -1,17 +1,9 @@
 {
   "name": "node-server-example",
+  "description": "Hello World App",
   "version": "0.0.1",
-  "description": "Hello World Example served by express",
-  "main": "server.js",
+  "private": true,
   "dependencies": {
-    "express": "*"
-  },
-  "devDependencies": {},
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node server.js"
-  },
-  "repository": "",
-  "author": "Richard Harvey",
-  "license": "AGPL"
+    "express": "4.x"
+  }
 }

supervisord.conf

@@ -26,8 +26,8 @@ directory=/usr/share/nginx/html/
 autostart=true
 autorestart=true
 startretries=3
-stderr_logfile=/var/log/webhook/node.err.log
-stdout_logfile=/var/log/webhook/node.out.log
+stderr_logfile=/var/log/node/node.err.log
+stdout_logfile=/var/log/node/node.out.log
 user=nginx
 
 [program:nginx]