don't default to app volume mount; create s3 bucket on boot; fix revAll gulp step

# Conflicts:
#	README.md

.dockerignore

@@ -0,0 +1,14 @@
+.DS_Store
+.git
+logs
+*.log
+scripts
+pids
+*.pid
+*.seed
+lib-cov
+coverage
+.grunt
+.lock-wscript
+build/Release
+node_modules

Dockerfile

@@ -0,0 +1,19 @@
+FROM spacedeck/docker-baseimage:latest
+ENV NODE_ENV production
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY package.json /usr/src/app/
+RUN npm install
+RUN npm install gulp-rev-replace gulp-clean gulp-fingerprint gulp-rev gulp-rev-all gulp-rev-replace
+RUN npm install -g --save-dev gulp
+
+COPY . /usr/src/app
+RUN gulp styles
+RUN npm cache clean
+
+CMD [ "npm", "start" ]
+
+EXPOSE 9666
+

Gulpfile.js

@@ -12,10 +12,9 @@ var uglify = require('gulp-uglify');
 var fingerprint = require('gulp-fingerprint');
 var rev = require('gulp-rev');
 
-var RevAll = require('gulp-rev-all');
+var revAll = require('gulp-rev-all');
 
 gulp.task('rev', () => {
-  var revAll = new RevAll();
   return gulp.src(['public/**'])
     .pipe(gulp.dest('build/assets'))
     .pipe(revAll.revision())

README.md

@@ -23,10 +23,10 @@ We appreciate filed issues, pull requests and general discussion.
 
 Spacedeck uses the following major building blocks:
 
+- Vue.js (Frontend)
 - Node.js 7.x (Backend / API)
 - MongoDB 3.x (Datastore)
 - Redis 3.x (Datastore for realtime channels)
-- Vue.js (Frontend)
 
 It also has some binary dependencies for media conversion and PDF export:
 
@@ -50,8 +50,14 @@ see: config/config.json
 
     export NODE_ENV=development
     npm start
+    open http://localhost:9666
 
-    open http://localhost:90000
+# experimental docker(compose) support
+
+We have a docker base image at https://github.com/spacedeck/docker-baseimage that includes all required binaries. Based on this image we can use Docker-Compose to bootstrap a Spacedeck including data storages.
+
+docker-compose build
+docker-compose run -e ENV=development -p 9666:9666 -e NODE_ENV=development spacedeck-open
 
 # License
 

app.js

@@ -47,7 +47,7 @@ swig.setFilter('cdn', function(input, idx) {
 app.engine('html', swig.renderFile);
 app.set('view engine', 'html');
 
-if (app.get('env') != 'development') {
+if (isProduction) {
   app.set('views', path.join(__dirname, 'build', 'views'));
   app.use(favicon(path.join(__dirname, 'build', 'assets', 'images', 'favicon.png')));
   app.use(express.static(path.join(__dirname, 'build', 'assets')));
@@ -121,11 +121,11 @@ if (app.get('env') == 'development') {
 module.exports = app;
 
 // CONNECT TO DATABASE
-const mongoHost = process.env.MONGO_PORT_27017_TCP_ADDR || 'localhost';
+const mongoHost = process.env.MONGO_PORT_27017_TCP_ADDR || 'db';
 mongoose.connect('mongodb://' + mongoHost + '/spacedeck');
 
 // START WEBSERVER
-const port = 9000;
+const port = 9666;
 
 const server = http.Server(app).listen(port, () => {
 

config/default.json

@@ -1,7 +1,8 @@
 {
-  "endpoint": "http://localhost:9000",
-  "storage_bucket": "my_spacedeck_s3_bucket",
-  "storage_cdn": "xyz.cloudfront.net",
+  "endpoint": "http://localhost:9666",
+  "storage_bucket": "sdeck-development",
+  "storage_cdn": "http://localhost:9123/sdeck-development",
+  "storage_endpoint": "http://storage:9000",
   "google_access" : "",
   "google_secret" : "",
   "admin_pass": "very_secret_admin_password",

docker-compose.yml

@@ -0,0 +1,34 @@
+version: '2'
+services:
+  sync:
+    image: redis
+  storage:
+    image: minio/minio
+    environment:
+      - MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE
+      - MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+    ports:
+      - 9123:9000
+    command: server /export
+  db:
+    image: mongo
+  spacedeck-open:
+    environment:
+      - env=development
+      - MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE
+      - MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+    build: .
+    volumes:
+      # - ./:/usr/src/app
+      - /usr/src/app/node_modules
+    command: npm start
+    ports:
+      - 9666:9666
+    depends_on:
+      - db
+      - sync
+      - storage
+    links:
+      - storage
+      - db
+      - sync

helpers/phantom.js

@@ -32,31 +32,36 @@ module.exports = {
     };
 
     phantom.create({ path: require('phantomjs-prebuilt').path }, function (err, browser) {
-      return browser.createPage(function (err, page) {
-        console.log("page created, opening ",space_url);
+      if(err){
+        console.log(err);
+      }else{
+        return browser.createPage(function (err, page) {
+          console.log("page created, opening ",space_url);
 
-        if (type=="pdf") {
-          var psz = {
-            width: space.advanced.width+"px",
-            height: space.advanced.height+"px"
-          };
-          page.set('paperSize', psz);
-        }
+          if (type=="pdf") {
+            var psz = {
+              width: space.advanced.width+"px",
+              height: space.advanced.height+"px"
+            };
+            page.set('paperSize', psz);
+          }
 
-        page.set('settings.resourceTimeout',timeout);
-        page.set('settings.javascriptEnabled',false);
+          page.set('settings.resourceTimeout',timeout);
+          page.set('settings.javascriptEnabled',false);
 
-        return page.open(space_url, function (err,status) {
-          page.render(export_path, function() {
-            on_success_called = true;
-            if (on_success) {
-              on_success(export_path);
-            }
-            page.close();
-            browser.exit();
+          return page.open(space_url, function (err,status) {
+            page.render(export_path, function() {
+              on_success_called = true;
+              if (on_success) {
+                on_success(export_path);
+              }
+              page.close();
+              browser.exit();
+            });
           });
-        });
-      });
+        });        
+      }
+
     }, {
       onExit: on_exit
     });

helpers/redis.js

@@ -5,7 +5,7 @@ const websockets = require('./websockets');
 
 module.exports = {
   connectRedis(){
-    const redisHost = process.env.REDIS_PORT_6379_TCP_ADDR || 'localhost';
+    const redisHost = process.env.REDIS_PORT_6379_TCP_ADDR || 'sync';
     this.connection = new RedisConnection(6379, redisHost);
   },
   sendMessage(action, model, attributes, channelId) {

helpers/uploader.js

@@ -6,11 +6,34 @@ AWS.config.region = 'eu-central-1';
 var fs = require('fs');
 var config = require('config');
 
+var cdn = config.get("storage_cdn");
+var storage_endpoint = config.get("storage_endpoint");
+
+const bucketName = "sdeck-fresh-development";
+const ep = new AWS.Endpoint(storage_endpoint);
+
+AWS.config.update(new AWS.Config({
+  accessKeyId: process.env.MINIO_ACCESS_KEY, 
+  secretAccessKey: process.env.MINIO_SECRET_KEY, 
+  region: 'us-east-1',
+  s3ForcePathStyle: true,
+  signatureVersion: 'v4'
+}));
+
+const s3 = new AWS.S3({
+  endpoint: ep
+});
+
+s3.createBucket({
+  Bucket: config.get("storage_bucket"),
+  ACL: "public-read",
+  GrantRead: "*"
+}, (err,res) => {
+  console.log("createBucket",err,res);
+});
+
 module.exports = {
   removeFile: (path, callback) => {
-    const s3 = new AWS.S3({
-      region: 'eu-central-1'
-    });
     const bucket = config.get("storage_bucket");
     s3.deleteObject({
       Bucket: bucket, Key: path
@@ -28,7 +51,7 @@ module.exports = {
       callback({error:"missing path"}, null);
       return;
     }
-    console.log("[s3] uploading", localFilePath, " to ", fileName);
+    console.log("[storage] uploading", localFilePath, " to ", fileName);
 
     const bucket = config.get("storage_bucket");
     const fileStream = fs.createReadStream(localFilePath);
@@ -39,11 +62,6 @@ module.exports = {
       }
     });
     fileStream.on('open', function () {
-      // FIXME
-      var s3 = new AWS.S3({
-        region: 'eu-central-1'
-      });
-
       s3.putObject({
         Bucket: bucket,
         Key: fileName,
@@ -54,7 +72,7 @@ module.exports = {
           console.error(err);
           callback(err);
         }else {
-          const url = "https://"+ config.get("storage_cdn") + "/" + fileName;
+          const url = cdn + "/" + fileName;
           console.log("[s3]" + localFilePath + " to " + url);
           callback(null, url);
         }

helpers/websockets.js

@@ -3,7 +3,7 @@ require('../models/schema');
 
 const WebSocketServer = require('ws').Server;
 
-const Redis = require('ioredis');
+const RedisConnection = require('ioredis');
 const async = require('async');
 const _ = require("underscore");
 const mongoose = require("mongoose");
@@ -12,7 +12,7 @@ const crypto = require('crypto');
 module.exports = {
   startWebsockets: function(server){
     this.setupSubscription();
-    this.state = new Redis(6379, process.env.REDIS_PORT_6379_TCP_ADDR || 'localhost');
+    this.state = new RedisConnection(6379, process.env.REDIS_PORT_6379_TCP_ADDR || 'sync');
 
     if(!this.current_websockets){
       this.current_websockets = [];
@@ -117,7 +117,7 @@ module.exports = {
   },
 
   setupSubscription: function() {
-    this.cursorSubscriber = new Redis(6379, process.env.REDIS_PORT_6379_TCP_ADDR || 'localhost');
+    this.cursorSubscriber = new RedisConnection(6379, process.env.REDIS_PORT_6379_TCP_ADDR || 'sync');
     this.cursorSubscriber.subscribe(['cursors', 'users', 'updates'], function (err, count) {
       console.log("[redis] websockets to " + count + " topics." );
     });

models/team.js

@@ -45,7 +45,7 @@ module.exports.teamSchema.index({
 
 module.exports.teamSchema.statics.getTeamForHost = (host, cb) => {
 
-  if (host != "127.0.0.1:9000") { //phantomjs check
+  if (host != "127.0.0.1:9666") { //phantomjs check
     let subDomainParts = host.split('.');
 
     if (subDomainParts.length > 2) {

views/spacedeck.html

@@ -23,10 +23,10 @@
       {% if process.env.NODE_ENV != "production" %}
         var ENV = {
           name: 'development',
-          webHost: "localhost:9000",
-          webEndpoint:"http://localhost:9000",
-          apiEndpoint: "http://localhost:9000",
-          websocketsEndpoint: "ws://localhost:9000"
+          webHost: "localhost:9666",
+          webEndpoint:"http://localhost:9666",
+          apiEndpoint: "http://localhost:9666",
+          websocketsEndpoint: "ws://localhost:9666"
         };
       {% endif %}