update docker to build latest

8 years ago · 28f20853bd
6 changed files with 145 additions and 1470 deletions
--- a/8
+++ b/8
@ -1,11 +1,7 @@
 FROM node:boron
 MAINTAINER Nathan LeClaire <nathan@docker.com>
-
 ADD . /app
 WORKDIR /app
-RUN apt-get update && apt-get upgrade -y
-RUN npm install
-
+RUN apt-get update && apt-get upgrade -y && yarn install && yarn global add grunt && yarn build
 EXPOSE 3000
-
-CMD node app.js
+CMD yarn start
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -32,5 +32,5 @@ module.exports = grunt => {

  grunt.initConfig(config);

-  grunt.registerTask('update-hterm', ['mkdir:tmp', 'gitclone:hterm', 'shell:build_hterm', 'clean']);
+  grunt.registerTask('default', ['mkdir:tmp', 'gitclone:hterm', 'shell:build_hterm', 'clean']);
 };
--- a/package.json
+++ b/package.json
@ -37,6 +37,8 @@
  },
  "scripts": {
    "lint": "eslint .",
-    "fix": "eslint . --fix"
+    "fix": "eslint . --fix",
+    "build": "grunt",
+    "start": "node app.js"
  }
 }
--- a/public/index.html
+++ b/public/index.html
@ -1,51 +1,47 @@
 <!doctype html>
 <html lang="en">
-
-<head>
+  <head>
    <meta charset="UTF-8">
    <title>Wetty - The WebTTY Terminal Emulator</title>
    <script src="/wetty/hterm_all.js"></script>
    <script src="/wetty/socket.io/socket.io.js"></script>
    <script src="/wetty/wetty.js"></script>
    <style>
-        html,
-        body {
-            height: 100%;
-            width: 100%;
-            margin: 0px;
-        }
-        #overlay {
-            position: absolute;
-            height: 100%;
-            width: 100%;
-            background-color: rgba(0,0,0,0.75);;
-            display: none;
-        }
-        #overlay input {
-            display: block;
-            margin: auto;
-            position: relative;
-            top: 50%;
-            transform: translateY(-50%);
-        }
-        #terminal {
-            display: block;
-            position: relative;
-            width: 100%;
-            height: 100%;
-        }
+      html, body {
+        height: 100%;
+        width: 100%;
+        margin: 0px;
+      }
+      #overlay {
+        position: absolute;
+        height: 100%;
+        width: 100%;
+        background-color: rgba(0,0,0,0.75);;
+        display: none;
+      }
+      #overlay input {
+        display: block;
+        margin: auto;
+        position: relative;
+        top: 50%;
+        transform: translateY(-50%);
+      }
+      #terminal {
+        display: block;
+        position: relative;
+        width: 100%;
+        height: 100%;
+      }
    </style>
-</head>
-
-<body>
+  </head>
+  <body>
    <div id="overlay"><input type="button" onclick="javascript:location.reload();" value="reconnect" /></div>
    <div id="terminal" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></div>
-	<script type="application/javascript">
-window.addEventListener('beforeunload', function(e) {
-	e.returnValue = "Are you sure?";
-	return e.returnValue;
-});
-	</script>
-</body>
-
+    <script type="application/javascript">
+      window.addEventListener('beforeunload', function(e) {
+        e.returnValue = "Are you sure?";
+        return e.returnValue;
+      });
+    </script>
+  </body>
 </html>
--- a/public/wetty/index.html
+++ b/public/wetty/index.html
@ -1,46 +1,47 @@
 <!doctype html>
 <html lang="en">
-
-<head>
+  <head>
    <meta charset="UTF-8">
    <title>Wetty - The WebTTY Terminal Emulator</title>
    <script src="/wetty/hterm_all.js"></script>
    <script src="/wetty/socket.io/socket.io.js"></script>
    <script src="/wetty/wetty.js"></script>
    <style>
-        html,
-        body {
-            height: 100%;
-            width: 100%;
-            margin: 0px;
-        }
-        #overlay {
-            position: absolute;
-            height: 100%;
-            width: 100%;
-            background-color: rgba(0,0,0,0.75);;
-            display: none;
-            z-index: 100;
-        }
-        #overlay input {
-            display: block;
-            margin: auto;
-            position: relative;
-            top: 50%;
-            transform: translateY(-50%);
-        }
-        #terminal {
-            display: block;
-            position: relative;
-            width: 100%;
-            height: 100%;
-        }
+      html, body {
+        height: 100%;
+        width: 100%;
+        margin: 0px;
+      }
+      #overlay {
+        position: absolute;
+        height: 100%;
+        width: 100%;
+        background-color: rgba(0,0,0,0.75);;
+        display: none;
+      }
+      #overlay input {
+        display: block;
+        margin: auto;
+        position: relative;
+        top: 50%;
+        transform: translateY(-50%);
+      }
+      #terminal {
+        display: block;
+        position: relative;
+        width: 100%;
+        height: 100%;
+      }
    </style>
-</head>
-
-<body>
+  </head>
+  <body>
    <div id="overlay"><input type="button" onclick="javascript:location.reload();" value="reconnect" /></div>
-    <div id="terminal"autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></div>
-</body>
-
+    <div id="terminal" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></div>
+    <script type="application/javascript">
+      window.addEventListener('beforeunload', function(e) {
+        e.returnValue = "Are you sure?";
+        return e.returnValue;
+      });
+    </script>
+  </body>
 </html>
--- a/yarn.lock
+++ b/yarn.lock