hobbyquaker · dersimn · Apr 27, 2018 · Apr 27, 2018 · Jul 4, 2018 · Jul 5, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,4 @@
-.idea
-node_modules
-bower_components
-tmp
-releases
-credentials.json
-npm-debug.log
-dist
+/node_modules
+/dist
+/build
+/package-lock.json
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,44 @@
+FROM ubuntu:18.04 as builder
+
+RUN apt-get update && apt-get install -y \
+        nginx-extras \
+        lua5.1 \
+        liblua5.1-dev \
+        git \
+        diffutils \
+        autoconf \
+        libssl1.0-dev \
+        make \
+        gettext-base \
+        curl \
+        wget \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN git clone https://github.com/dersimn/luacrypto /opt/luacrypto \
+    && cd /opt/luacrypto \
+    && autoreconf -i \
+    && ./configure \
+    && make
+
+RUN curl -sSL -o /mo https://git.io/get-mo && chmod a+x /mo
+
+
+FROM ubuntu:18.04
+
+RUN apt-get update && apt-get install -y \
+        nginx-extras \
+        lua5.1 \
+        libssl1.0 \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /opt/luacrypto/src/.libs/crypto.so /usr/local/lib/lua/5.1/crypto.so
+COPY --from=builder /mo /usr/local/bin/mo
+
+COPY dist /www
+COPY nginx.template /nginx.template
+COPY run.bash /run.bash
+
+EXPOSE 80
+EXPOSE 443
+
+CMD ["bash", "/run.bash"]
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -0,0 +1,44 @@
+FROM arm32v7/ubuntu:18.04 as builder
+
+RUN apt-get update && apt-get install -y \
+        nginx-extras \
+        lua5.1 \
+        liblua5.1-dev \
+        git \
+        diffutils \
+        autoconf \
+        libssl1.0-dev \
+        make \
+        gettext-base \
+        curl \
+        wget \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN git clone https://github.com/dersimn/luacrypto /opt/luacrypto \
+    && cd /opt/luacrypto \
+    && autoreconf -i \
+    && ./configure \
+    && make
+
+RUN curl -sSL -o /mo https://git.io/get-mo && chmod a+x /mo
+
+
+FROM arm32v7/ubuntu:18.04
+
+RUN apt-get update && apt-get install -y \
+        nginx-extras \
+        lua5.1 \
+        libssl1.0 \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /opt/luacrypto/src/.libs/crypto.so /usr/local/lib/lua/5.1/crypto.so
+COPY --from=builder /mo /usr/local/bin/mo
+
+COPY dist /www
+COPY nginx.template /nginx.template
+COPY run.bash /run.bash
+
+EXPOSE 80
+EXPOSE 443
+
+CMD ["bash", "/run.bash"]
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,91 +1,94 @@
+const pkg = require('./package.json');
 
 module.exports = function (grunt) {
-    grunt.config.data.bower = require('./bower.json');
     grunt.initConfig({
-        "steal-build": {
-            bundle: {
+        pkg: pkg,
+
+        browserify: {
+            pkgjs: {
+                src: ['./package.json'],
+                dest: 'build/package.js',
                 options: {
-                    system: {
-                        config: "bower.json!bower"
+                    browserifyOptions: {
+                        standalone: 'pkg'
                     }
                 }
+            },
+        },
+
+        less: {
+            dist: {
+                options: {
+                    paths: ["assets/css"]
+                },
+                files: {"build/index.css": "index.less"}
             }
         },
+
+        concat: {
+            js: {
+                src: [
+                    'build/package.js',
+                    'node_modules/jquery/dist/jquery.js',
+                    'node_modules/components-jqueryui/jquery-ui.js',
+                    'node_modules/free-jqgrid/dist/jquery.jqgrid.src.js',
+                    'node_modules/free-jqgrid/dist/plugins/ui.multiselect.js',
+                    'node_modules/store-js/dist/store.legacy.min.js',
+                    'node_modules/paho-mqtt/paho-mqtt.js'
+                ],
+                dest: 'dist/bundle.js'
+            },
+            css: {
+                src: [
+                    'node_modules/components-jqueryui/themes/base/jquery-ui.css',
+                    'node_modules/components-jqueryui/themes/redmond/jquery-ui.css',
+                    'node_modules/free-jqgrid/dist/css/ui.jqgrid.css',
+                    'node_modules/free-jqgrid/dist/plugins/css/ui.multiselect.css',
+                    'build/index.css'
+                ],
+                dest: 'dist/bundle.css'
+            }
+        },
+
         copy: {
-            release: {
+            dist: {
                 files: [
                     {
                         expand: true,
+                        flatten: true,
+                        src: [
+                            'node_modules/components-jqueryui/themes/redmond/images/*'
+                        ],
+                        dest: 'dist/images/'
+                    },
+                    {
                         src: [
-                            'bower_components/steal/steal.production.js',
-                            'bower_components/jquery-ui/themes/redmond/images/**',
-                            'dist/bundles/**',
-                            'LICENSE',
-                            'README.md'
+                            'index.html',
+                            'index.js',
+
                         ],
-                        dest: 'tmp/'
+                        dest: 'dist/'
                     }
                 ]
             }
         },
+
         clean: {
-            release: ["tmp"]
-        },
-        'string-replace': {
-            release: {
-                files: {
-                    'tmp/': 'index.html'
-                },
-                options: {
-                    replacements: [{
-                        pattern: 'bower_components\/steal\/steal\.js',
-                        replacement: 'bower_components/steal/steal.production.js'
-                    }]
-                }
-            }
-        },
-        zip: {
-            'release': {
-                router: function (filepath) {
-                    return filepath.replace(/^tmp/, 'mqtt-admin');
-                },
-                src: ['tmp/**'],
-                dest: 'releases/mqtt-admin_' + grunt.config.data.bower.version + '.zip'
-            }
-        },
-        bump: {
-            options: {
-                files: ['bower.json'],
-                updateConfigs: ['bower'],
-                commit: false,
-                commitMessage: 'Release v%VERSION%',
-                commitFiles: ['package.json'],
-                createTag: false,
-                tagName: 'v%VERSION%',
-                tagMessage: 'Version %VERSION%',
-                push: false,
-                pushTo: 'upstream',
-                gitDescribeOptions: '--tags --always --abbrev=1 --dirty=-d',
-                globalReplace: false,
-                regExp: false,
-                prereleaseName: 'beta'
-            }
+            build: [
+                'build/',
+                'dist/',
+                'node_modules/',
+                'package-lock.json'
+            ]
         }
+
     });
 
-    grunt.loadNpmTasks("steal-tools");
+    grunt.loadNpmTasks('grunt-browserify');
+    grunt.loadNpmTasks('grunt-contrib-concat');
+    grunt.loadNpmTasks('grunt-contrib-less');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-string-replace');
-    grunt.loadNpmTasks('grunt-bump');
-    grunt.loadNpmTasks('grunt-zip');
-
-    grunt.registerTask("build", ["steal-build", "clean", "copy", "string-replace"]);
-    grunt.registerTask("release prerelease", ["bump:prerelease", "build", "zip"]);
-    grunt.registerTask("release patch", ["bump:patch", "build", "zip"]);
-    grunt.registerTask("release minor", ["bump:minor", "build", "zip"]);
-    grunt.registerTask("release major", ["bump:major", "build", "zip"]);
-    grunt.registerTask("release premajor", ["bump:premajor", "build", "zip"]);
-
 
+    grunt.registerTask('default', ['browserify', 'less', 'concat', 'copy']);
 };
diff --git a/README.md b/README.md
@@ -1,78 +1,53 @@
-# mqtt-admin
+This is a fork from https://github.com/hobbyquaker/mqtt-admin used to generate Docker Images. See original documentation for reference about the script itself.
 
-MQTT Web Frontend: Publish, Subscribe and see Topic Status in a comfortable UI. 
+## Supported tags
 
-## getting started
+* [`1.2.0`, `latest`](https://github.com/dersimn/mqtt-admin/tree/v1.2.0)
+* [`1.1.0`](https://github.com/dersimn/mqtt-admin/tree/v1.1.0)
+* [`1.0.0`, `hobbyquaker-untouched`](https://github.com/hobbyquaker/mqtt-admin/releases/tag/v1.0.0)
 
-Download [mqtt-admin.zip](https://github.com/hobbyquaker/mqtt-admin/releases/latest), unzip, put it on a webserver and 
-open index.html with a modern browser. You can also give it a try by just visiting https://hobbyquaker.github.io/mqtt-admin
+Images for Raspberry Pi are available with the suffix `-armhf`. E.g.: `1.0.0` -> `1.0.0-armhf`.
 
-### Usage
+## Config
 
-mqtt-admin offers 3 tabs, Publish, Subscribe and Status, these are described in more detail below. Topic input fields offer
-autocompletion, mqtt-admin subscribes # to get all availabe topics to be able to offer this. Broker settings, the UI state, 
-subscriptions and the publish history are persisted in your browser local storage.
+This image can proxy-pass the Websocket connection from your MQTT broker, by setting the env variable `MQTT_HOST`.  
+You have to enable Websockets on your broker. The Docker Image [toke/mosquitto](https://hub.docker.com/r/toke/mosquitto) for e.g. has it already enabled by default on [port 9001](https://github.com/toke/docker-mosquitto/blob/8aa0a74b444fb2377fcd4a43ac85a257aef51176/config/conf.d/websockets.conf#L1), where the official Docker Image [eclipse-mosquitto](https://hub.docker.com/_/eclipse-mosquitto) need to be configured first.
 
-#### Publish
+    docker run -d --restart=always \
+        -e "MQTT_HOST=10.1.1.50:9001" \
+        -p 80:80 \
+        dersimn/mqtt-admin
 
-Just enter a topic and a payload and click the publish button. The payload input field can be resized vertically and has
-a built in JSON linter - a checkmark below the input field will indicate valid JSON.
+If you provide an SSL key/cert pair in `/ssl`, the Docker Image will also enable HTTPS:
 
-Every publish is saved in the history table, you can refill the input fields by clicking in history, a double click
-immediatly publishes again (not retained).
+* `/ssl/nginx.key`
+* `/ssl/nginx.crt`
 
-#### Subscribe
+Additionally you can enable client-authentification via SSL certificates, by providing:
 
-It's possible to open a unlimited number of subscriptions tabs that can contain a unlimited number of single subscriptions.
-You can color your subscriptions, but you have to select a color before you enter a topic and press enter. 
-Subscription tabs can be renamed by double-clicking on the name.
-Every subscription tab has Play/Pause/Stop buttons, pause will cache incoming messages and delay insertion into the DOM
-until you activate play again. The trash button just clears the table.
+* `/ssl/client.crt`
 
-#### Status
+In case you have revoked clients, also prodive a `/ssl/client.crl` file.
 
-The status table shows the last-received payload of the listed topics, it's meant to keep an eye on e.g. _current_ sensor
-data without being interested in previous data. 
+A nice tutorial on how to generate your own certificates, is located [here](https://jamielinux.com/docs/openssl-certificate-authority/introduction.html).
 
-#### Warnings
+    docker run -d --restart=always \
+        -v $(pwd)/ssl:/ssl:ro \
+        -e "MQTT_HOST=10.1.1.50:9001" \
+        -p 80:80 \
+        -p 443:443 \
+        dersimn/mqtt-admin
 
-* This tool is meant to be used with keyboard and mouse, I do not plan any efforts on optimizing it for touch devices.
-* Connecting to test.mosquitto.org will stress your browser (Many retained topics, big payloads, ...).
+If you want to change the default ports, specify it like this: `-p 8001:80 -p 8443:443 -e "HTTPS_REDIRECT_PORT=8443"`.
 
-#### mqtt-smarthome
+HTTPS and client-auth are optional for clients connecting via a local IP, according to [these](https://github.com/dersimn/mqtt-smarthome-webui/blob/6e419811d3bd433e5fc594e1beccaa0499fe08cf/nginx.template#L69) IP ranges. If you make port 80/443 public to the Internet you should definitely enable client-auth.
 
-mqtt-admin contains some syntactic sugar for [mqtt-smarthome](https://github.com/mqtt-smarthome/) users (special columns
-in status tab, auto-completion of // to /status/ and /set/)
+## Development
 
+Basic build:
 
-## contributing
-
-Pull Requests welcome!
-
-Dependencies are managed with [Bower](http://bower.io/), [StealJS](http://stealjs.com/) takes care of module loading, 
-the [Grunt](http://gruntjs.com/) task named "build" creates a production build in tmp dir.
-
-
-## license
-
-The MIT License (MIT)
-
-Copyright (c) Sebastian Raff <hq@ccu.io> (https://github.com/hobbyquaker)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE. 
+    npm install
+    grunt
+    docker build -t dersimn/mqtt-admin .
+    docker build -t dersimn/mqtt-admin:armhf -f Dockerfile.armhf .
+    grunt clean
diff --git a/bower.json b/bower.json