Merge pull request #4 from ogazitt/master

pull omris changes

Author: flacnut

Dockerfile

@@ -0,0 +1,12 @@
+FROM hwestphal/nodebox
+
+COPY ./ /src
+WORKDIR /src
+
+RUN npm install
+
+EXPOSE  8080
+CMD ["node", "server.js"]
+
+
+

index.html

@@ -11,15 +11,15 @@
   <!-- Set the viewport width to device width for mobile -->
   <meta name="viewport" content="width=device-width" />
 
-  <title>Stackato Environment Variables :: Phani Raju</title>
+  <title>Node Environment Demo</title>
 
   <!-- Included CSS Files (Uncompressed) -->
   <!--
   <link rel="stylesheet" href="stylesheets/foundation.css">
   -->
 
   <!-- Included CSS Files (Compressed) -->
-  <link rel="stylesheet" href="stylesheets/foundation.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/foundation/3.2.5/stylesheets/foundation.css">
   <link rel="stylesheet" href="stylesheets/app.css">
 
   <script src="javascripts/modernizr.foundation.js"></script>
@@ -45,17 +45,24 @@
 
   <nav class="top-bar">
     <ul>
-      <!-- Title Area -->
+      <li class="name">
+        <img src="HP_Helion_cloud_icon.jpg" alt="[ Helion CI ]"</img>
+      </li>
+
       <li class="name">
         <h1>
-          <a href="#" >
-            <span style="color: #c5e5ef">[ Stackato ]</span> Aiken Cloud CI System Environment Variables
-          </a>
+          <a href="#">&nbsp;Dev Platform Mark Demo</a>
         </h1>
       </li>
-      <li class="toggle-nav"><a href="#system-info">CI Deployment Target Failed System Information</a></li>
-    </ul>
+      <li class="name two columns">
+        <h1>
 
+          <a href="#">Environment Variables</a>
+        </h1>
+      </li>
+      <li class="toggle-nav seven columns offset-by-one">
+        <a href="#system-info">System Information</a></li>
+    </ul>
   </nav>
 
 

kube/kube-node-env

@@ -0,0 +1,4 @@
+#!/bin/sh
+kubectl create -f node-env-rc.yaml
+kubectl create -f node-env-svc.yaml
+kubectl cluster-info --namespace=default

kube/node-env-rc.yaml

@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: node-env-v1
+  labels:
+    app: node-env
+    version: v1
+    kubernetes.io/cluster-service: "true"
+spec:
+  replicas: 1
+  selector:
+    app: node-env
+    version: v1
+  template:
+    metadata:
+      labels:
+        app: node-env
+        version: v1
+        kubernetes.io/cluster-service: "true"
+    spec:
+      containers:
+      - name: node-env
+        image: ogazitt/node-env:latest
+        resources:
+          limits:
+            cpu: 100m
+            memory: 50Mi
+        ports:
+        - containerPort: 8080
+

kube/node-env-svc.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: node-env
+  labels:
+    app: node-env
+    kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "node-env"
+spec:
+  selector:
+    app: node-env
+  ports:
+  - port: 80
+    targetPort: 8080
+

server.js

@@ -5,14 +5,15 @@ var http = require("http"),
     mustache = require("./lib/mustache"),
     keyprocessor = require("./lib/keyprocessor"),
     sysinfo = require('./lib/sysinfo'),
-    port = process.env.PORT || 8888;
+    port = process.env.PORT || 8080;
 
 http.createServer(function(request, response) {
 
     var uri = url.parse(request.url).pathname,
         filename = path.join(process.cwd(), uri);
+    console.log("uri: " + uri + "\nfilename: " + filename);
 
-    path.exists(filename, function(exists) {
+    fs.exists(filename, function(exists) {
         if (!exists) {
             response.writeHead(404, {
                 "Content-Type": "text/plain"
@@ -42,6 +43,7 @@ http.createServer(function(request, response) {
                 response.end()
                 return;
             });
+            return; //need to return here otherwise the code below will execute. 
         }
 
         if (fs.statSync(filename).isDirectory()) filename += '/index.html';
@@ -59,6 +61,7 @@ http.createServer(function(request, response) {
             response.writeHead(200);
             response.write(file, "binary");
             response.end();
+            return;
         });
     });
 }).listen(parseInt(port, 10));

test/test.js

@@ -1,5 +1,5 @@
 var http = require('http'),
-    should = require('should'),
+  should = require('should'),
     sysInfo = require('../lib/sysinfo.js'),
     keyProcessor = require('../lib/keyprocessor.js'),
     hock = require('hock');