Merge branch 'develop'

app/Http/Controllers/UserController.php

@@ -9,7 +9,13 @@ class UserController extends BaseController
 {
     public function __construct()
     {
-        $this->kerberos = Config::get("kerberos");
+        $this->kerberos = Session::get('kerberos', []);
+        if(count($this->kerberos) == 0)
+        {
+            $this->kerberos = Config::get("kerberos");
+            Session::put('kerberos', $this->kerberos);
+        }
+
         $this->fileLoader = new FileLoader(new Filesystem(), config_path());
     }
 
@@ -58,10 +64,9 @@ public function install()
         }
 
         $this->fileLoader->save($config, '', 'kerberos');
+        Session::put('kerberos', $config);
 
-        $newConfig = Config::get("kerberos");
-
-        if($newConfig['installed'])
+        if($config['installed'])
         {
             $config["error"] = false;
             return Response::json($config);

config/app.php

@@ -13,7 +13,7 @@
     |
     */
 
-    'version' => '2.5.0',
+    'version' => '2.5.1',
 
     'config' => '/etc/opt/kerberosio/config',
 

docker/Dockerfile

@@ -26,13 +26,15 @@ RUN ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/defau
 #####################
 # Clone and build web
 
+RUN curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash - && apt-get install -y nodejs
+
 RUN git clone https://github.com/kerberos-io/web /var/www/web && cd /var/www/web && git checkout ${APP_ENV} && \
 chown -Rf www-data.www-data /var/www/web && curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer && \
 cd /var/www/web && \
 composer install --prefer-source && \
 npm install -g bower && \
 cd public && \
-nodejs /usr/local/bin/bower --allow-root install
+nodejs /usr/lib/node_modules/bower/bin/bower --allow-root install
 
 RUN rm /var/www/web/public/capture && \
 ln -s /etc/opt/kerberosio/capture/ /var/www/web/public/capture

public/bower.json

@@ -32,15 +32,15 @@
     "seiyria-bootstrap-slider": "5.3.3",
     "csshake": "*",
     "chartjs": "1.0.2",
-    "mjpegcanvas": "~0.4.0",
-    "mustache": "~0.7.0",
-    "fontawesome": "~4.7.0",
-    "css-toggle-switch": "~4.0.2",
+    "mjpegcanvas": "0.4.0",
+    "mustache": "0.7.0",
+    "fontawesome": "4.7.0",
+    "css-toggle-switch": "4.0.2",
     "remodal": "0.6.4",
     "progressbar.js": "~1.0.0",
-    "photoswipe": "~4.1.1",
+    "photoswipe": "4.1.1",
     "video.js": "5.17.0",
-    "videojs-playlist": "^3.0.0",
+    "videojs-playlist": "3.0.0",
     "owl.carousel": "2.2.0"
   }
 }