From 7a66d116d4f5cb941eac8161dc61a1c787d16b31 Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@fuentelibre.org>
Date: Mon, 17 Sep 2018 02:05:31 -0500
Subject: [PATCH 01/23] Add rpicam software

---
 builder/chroot-script.sh            | 14 ++++++++++++++
 builder/files/etc/rc.local          | 14 ++++++++++++++
 builder/files/etc/rpicam_config.txt |  8 ++++++++
 3 files changed, 36 insertions(+)
 create mode 100755 builder/files/etc/rc.local
 create mode 100644 builder/files/etc/rpicam_config.txt

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index f9ac33b..fe77ab4 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -147,6 +147,12 @@ apt-get  -o Dpkg::Options::=--force-confdef \
   pi-bluetooth \
   lsb-release \
   gettext \
+  unzip \
+  zip \
+  libav-tools \
+  gstreamer1.0-tools \
+  motion \
+  gpac \
   cloud-init
 
 
@@ -209,6 +215,14 @@ echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
 chmod +x usr/local/bin/rpi-serial-console
 
+echo "Installing RPi Cam Web Interface"
+wget -q https://github.com/silvanmelchior/RPi_Cam_Web_Interface/archive/master.zip -O /tmp/rpicam.zip
+cd /tmp/
+unzip rpicam.zip
+cd RPi_Cam_Web_Interface-master
+cp /etc/rpicam_config.txt config.txt
+bash ./install.sh q
+
 # fix eth0 interface name
 ln -s /dev/null /etc/systemd/network/99-default.link
 
diff --git a/builder/files/etc/rc.local b/builder/files/etc/rc.local
new file mode 100755
index 0000000..65634df
--- /dev/null
+++ b/builder/files/etc/rc.local
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+exit 0
diff --git a/builder/files/etc/rpicam_config.txt b/builder/files/etc/rpicam_config.txt
new file mode 100644
index 0000000..325c3f4
--- /dev/null
+++ b/builder/files/etc/rpicam_config.txt
@@ -0,0 +1,8 @@
+rpicamdir="cam"
+webserver=""
+webport="80"
+user=""
+webpasswd=""
+autostart="yes"
+jpglink="no"
+phpversion="7"

From 26ef94753552dbd78f4a92d8531aca3d5380b425 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Mon, 22 Oct 2018 18:27:02 -0400
Subject: [PATCH 02/23] Install infragram

---
 builder/build.sh                 |  2 +-
 builder/chroot-script.sh         | 15 +++++++++++++++
 builder/files/var/www/index.html |  4 +++-
 versions.config                  |  4 ++--
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/builder/build.sh b/builder/build.sh
index eaf17f2..aee6799 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -84,7 +84,7 @@ ls -alh /image_with_kernel_*.tar.gz
 
 # download the ready-made raw image for the RPi
 if [ ! -f "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" ]; then
-  wget -q -O "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" "https://github.com/hypriot/image-builder-raw/releases/download/${RAW_IMAGE_VERSION}/${RAW_IMAGE}.zip"
+  wget -q -O "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" "https://jenkins.laboratoriopublico.org/job/image-builder-raw/ws/${RAW_IMAGE}.zip"
 fi
 
 # verify checksum of the ready-made raw image
diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index fe77ab4..19fd25d 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -211,6 +211,21 @@ lighttpd-enable-mod fastcgi-php
 systemctl disable dhcpcd
 systemctl disable hciuart
 
+echo "Installing infragram"
+
+# install npm/node:
+curl -o node-v9.7.1-linux-armv6l.tar.gz https://nodejs.org/dist/v9.7.1/node-v9.7.1-linux-armv6l.tar.gz
+tar -xzf node-v9.7.1-linux-armv6l.tar.gz
+sudo cp -r node-v9.7.1-linux-armv6l/* /usr/local/
+sudo apt-get install git
+
+# install infragram in the web public folder:
+cd /var/www/
+git clone https://github.com/publiclab/infragram.git
+cd infragram
+npm install
+cd /
+
 echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
 chmod +x usr/local/bin/rpi-serial-console
diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 83618d4..9ce38a0 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -26,8 +26,10 @@ <h2>Public Lab Pi Camera Kit</h2>
     <p>If you're seeing this in a pop-up, close it and open <a href="http://pi.local">http://pi.local</a> in a browser.</p>
     <p>On Android devices, you may have to turn off cellular data to use this in a browser.</p>
 
-
     <p>While connected to this camera, you won't have regular internet access.</p>
 
+    <p><a href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
+    <p><a href="http://pi.local/cam/">Access the camera</a></p>
+    
   </body>
 </html>
diff --git a/versions.config b/versions.config
index f7bb136..d1e5bfc 100644
--- a/versions.config
+++ b/versions.config
@@ -4,8 +4,8 @@ ROOTFS_TAR_CHECKSUM="d1e7e6d48a25b4a206c5df99ecb8815388ec6945e4f97e78413d5a80778
 
 # name of the ready made raw image for RPi
 RAW_IMAGE="rpi-raw.img"
-RAW_IMAGE_VERSION="v0.2.2"
-RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1c2c6"
+RAW_IMAGE_VERSION="master"
+RAW_IMAGE_CHECKSUM="e32c0b9f3cdb9c60bad97a724103fc1283cdc135848e6142d588cd96fac1d6a8"
 
 # specific versions of kernel/firmware and docker tools
 export KERNEL_BUILD="20180422-141901"

From 609673d8f16b1dd8fb3685e2fe4aafc65050b829 Mon Sep 17 00:00:00 2001
From: jywarren <jeff@unterbahn.com>
Date: Thu, 1 Nov 2018 11:29:32 -0400
Subject: [PATCH 03/23] add image sequencer

---
 builder/chroot-script.sh         | 11 ++++++++++-
 builder/files/var/www/index.html |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 19fd25d..e292997 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -219,13 +219,22 @@ tar -xzf node-v9.7.1-linux-armv6l.tar.gz
 sudo cp -r node-v9.7.1-linux-armv6l/* /usr/local/
 sudo apt-get install git
 
-# install infragram in the web public folder:
 cd /var/www/
+
+# install infragram in the web public folder:
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install
 cd /
 
+echo "Installing image-sequencer"
+# install image-sequencer in the web public folder:
+git clone https://github.com/publiclab/image-sequencer.git
+cd image-sequencer
+npm install
+
+cd /
+
 echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
 chmod +x usr/local/bin/rpi-serial-console
diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 9ce38a0..1e90121 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -30,6 +30,7 @@ <h2>Public Lab Pi Camera Kit</h2>
 
     <p><a href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
     <p><a href="http://pi.local/cam/">Access the camera</a></p>
+    <p><a href="http://pi.local/image-sequencer/examples/">Access Image Sequencer software</a></p>
     
   </body>
 </html>

From 32fbea8e08c9419f2a9c4f669eaf480418ee5a59 Mon Sep 17 00:00:00 2001
From: jywarren <jeff@unterbahn.com>
Date: Mon, 5 Nov 2018 12:25:20 -0500
Subject: [PATCH 04/23] added buttons and new version of image sequencer

---
 builder/chroot-script.sh         | 3 ++-
 builder/files/var/www/index.html | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index e292997..0fc4c63 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -222,10 +222,11 @@ sudo apt-get install git
 cd /var/www/
 
 # install infragram in the web public folder:
+echo "Installing infragram"
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install
-cd /
+cd /var/www/
 
 echo "Installing image-sequencer"
 # install image-sequencer in the web public folder:
diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 1e90121..61fa061 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -28,9 +28,9 @@ <h2>Public Lab Pi Camera Kit</h2>
 
     <p>While connected to this camera, you won't have regular internet access.</p>
 
-    <p><a href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
-    <p><a href="http://pi.local/cam/">Access the camera</a></p>
-    <p><a href="http://pi.local/image-sequencer/examples/">Access Image Sequencer software</a></p>
+    <p><a class="btn" href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
+    <p><a class="btn" href="http://pi.local/cam/">Access the camera</a></p>
+    <p><a class="btn" href="http://pi.local/image-sequencer/examples/">Access Image Sequencer software</a></p>
     
   </body>
 </html>

From 42ee9e25c7bf5bee495dec26ac6aced707316b98 Mon Sep 17 00:00:00 2001
From: jywarren <jeff@unterbahn.com>
Date: Sat, 17 Nov 2018 13:29:43 -0500
Subject: [PATCH 05/23] tweak to rebuild w/ new image sequencer

---
 builder/chroot-script.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 0fc4c63..7b6ec50 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -233,7 +233,6 @@ echo "Installing image-sequencer"
 git clone https://github.com/publiclab/image-sequencer.git
 cd image-sequencer
 npm install
-
 cd /
 
 echo "Installing rpi-serial-console script"

From 01cdcbc82ceb7e04a75a2f6f89e9bf61449cfc98 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Fri, 21 Jun 2019 16:44:16 -0400
Subject: [PATCH 06/23] Trigger rebuild

---
 builder/files/var/www/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 61fa061..432dbe9 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -31,6 +31,6 @@ <h2>Public Lab Pi Camera Kit</h2>
     <p><a class="btn" href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
     <p><a class="btn" href="http://pi.local/cam/">Access the camera</a></p>
     <p><a class="btn" href="http://pi.local/image-sequencer/examples/">Access Image Sequencer software</a></p>
-    
+
   </body>
 </html>

From f5d490570961010edf15cdd748174ee4c10aabfc Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@fuentelibre.org>
Date: Mon, 17 Sep 2018 02:05:31 -0500
Subject: [PATCH 07/23] Add rpicam software

---
 builder/chroot-script.sh            | 14 ++++++++++++++
 builder/files/etc/rc.local          | 14 ++++++++++++++
 builder/files/etc/rpicam_config.txt |  8 ++++++++
 3 files changed, 36 insertions(+)
 create mode 100755 builder/files/etc/rc.local
 create mode 100644 builder/files/etc/rpicam_config.txt

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 2f6ac99..5bdf591 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -144,6 +144,12 @@ apt-get  -o Dpkg::Options::=--force-confdef \
   pi-bluetooth \
   lsb-release \
   gettext \
+  unzip \
+  zip \
+  libav-tools \
+  gstreamer1.0-tools \
+  motion \
+  gpac \
   cloud-init
 
 
@@ -206,6 +212,14 @@ echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
 chmod +x usr/local/bin/rpi-serial-console
 
+echo "Installing RPi Cam Web Interface"
+wget -q https://github.com/silvanmelchior/RPi_Cam_Web_Interface/archive/master.zip -O /tmp/rpicam.zip
+cd /tmp/
+unzip rpicam.zip
+cd RPi_Cam_Web_Interface-master
+cp /etc/rpicam_config.txt config.txt
+bash ./install.sh q
+
 # fix eth0 interface name
 ln -s /dev/null /etc/systemd/network/99-default.link
 
diff --git a/builder/files/etc/rc.local b/builder/files/etc/rc.local
new file mode 100755
index 0000000..65634df
--- /dev/null
+++ b/builder/files/etc/rc.local
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+exit 0
diff --git a/builder/files/etc/rpicam_config.txt b/builder/files/etc/rpicam_config.txt
new file mode 100644
index 0000000..325c3f4
--- /dev/null
+++ b/builder/files/etc/rpicam_config.txt
@@ -0,0 +1,8 @@
+rpicamdir="cam"
+webserver=""
+webport="80"
+user=""
+webpasswd=""
+autostart="yes"
+jpglink="no"
+phpversion="7"

From a094e04b8043f8032b72c7585a22e439116bafc6 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Mon, 22 Oct 2018 18:27:02 -0400
Subject: [PATCH 08/23] Install infragram

---
 builder/build.sh                 |  2 +-
 builder/chroot-script.sh         | 15 +++++++++++++++
 builder/files/var/www/index.html |  4 +++-
 versions.config                  |  4 ++--
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/builder/build.sh b/builder/build.sh
index eaf17f2..aee6799 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -84,7 +84,7 @@ ls -alh /image_with_kernel_*.tar.gz
 
 # download the ready-made raw image for the RPi
 if [ ! -f "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" ]; then
-  wget -q -O "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" "https://github.com/hypriot/image-builder-raw/releases/download/${RAW_IMAGE_VERSION}/${RAW_IMAGE}.zip"
+  wget -q -O "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" "https://jenkins.laboratoriopublico.org/job/image-builder-raw/ws/${RAW_IMAGE}.zip"
 fi
 
 # verify checksum of the ready-made raw image
diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 5bdf591..895a6d5 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -208,6 +208,21 @@ lighttpd-enable-mod fastcgi-php
 systemctl disable dhcpcd
 systemctl disable hciuart
 
+echo "Installing infragram"
+
+# install npm/node:
+curl -o node-v9.7.1-linux-armv6l.tar.gz https://nodejs.org/dist/v9.7.1/node-v9.7.1-linux-armv6l.tar.gz
+tar -xzf node-v9.7.1-linux-armv6l.tar.gz
+sudo cp -r node-v9.7.1-linux-armv6l/* /usr/local/
+sudo apt-get install git
+
+# install infragram in the web public folder:
+cd /var/www/
+git clone https://github.com/publiclab/infragram.git
+cd infragram
+npm install
+cd /
+
 echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
 chmod +x usr/local/bin/rpi-serial-console
diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 83618d4..9ce38a0 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -26,8 +26,10 @@ <h2>Public Lab Pi Camera Kit</h2>
     <p>If you're seeing this in a pop-up, close it and open <a href="http://pi.local">http://pi.local</a> in a browser.</p>
     <p>On Android devices, you may have to turn off cellular data to use this in a browser.</p>
 
-
     <p>While connected to this camera, you won't have regular internet access.</p>
 
+    <p><a href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
+    <p><a href="http://pi.local/cam/">Access the camera</a></p>
+    
   </body>
 </html>
diff --git a/versions.config b/versions.config
index dbe6c04..4f2cbe5 100644
--- a/versions.config
+++ b/versions.config
@@ -4,8 +4,8 @@ ROOTFS_TAR_CHECKSUM="d1e7e6d48a25b4a206c5df99ecb8815388ec6945e4f97e78413d5a80778
 
 # name of the ready made raw image for RPi
 RAW_IMAGE="rpi-raw.img"
-RAW_IMAGE_VERSION="v0.2.2"
-RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1c2c6"
+RAW_IMAGE_VERSION="master"
+RAW_IMAGE_CHECKSUM="e32c0b9f3cdb9c60bad97a724103fc1283cdc135848e6142d588cd96fac1d6a8"
 
 # specific versions of kernel/firmware and docker tools
 export KERNEL_BUILD="1.20190517-1"

From 1493a0215d7e36fdc503e21d7ed9c00033ada17e Mon Sep 17 00:00:00 2001
From: jywarren <jeff@unterbahn.com>
Date: Thu, 1 Nov 2018 11:29:32 -0400
Subject: [PATCH 09/23] add image sequencer

---
 builder/chroot-script.sh         | 11 ++++++++++-
 builder/files/var/www/index.html |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 895a6d5..4a45f11 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -216,13 +216,22 @@ tar -xzf node-v9.7.1-linux-armv6l.tar.gz
 sudo cp -r node-v9.7.1-linux-armv6l/* /usr/local/
 sudo apt-get install git
 
-# install infragram in the web public folder:
 cd /var/www/
+
+# install infragram in the web public folder:
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install
 cd /
 
+echo "Installing image-sequencer"
+# install image-sequencer in the web public folder:
+git clone https://github.com/publiclab/image-sequencer.git
+cd image-sequencer
+npm install
+
+cd /
+
 echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
 chmod +x usr/local/bin/rpi-serial-console
diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 9ce38a0..1e90121 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -30,6 +30,7 @@ <h2>Public Lab Pi Camera Kit</h2>
 
     <p><a href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
     <p><a href="http://pi.local/cam/">Access the camera</a></p>
+    <p><a href="http://pi.local/image-sequencer/examples/">Access Image Sequencer software</a></p>
     
   </body>
 </html>

From 7c89233af5415ae9209b740674335382c991c8b9 Mon Sep 17 00:00:00 2001
From: jywarren <jeff@unterbahn.com>
Date: Mon, 5 Nov 2018 12:25:20 -0500
Subject: [PATCH 10/23] added buttons and new version of image sequencer

---
 builder/chroot-script.sh         | 3 ++-
 builder/files/var/www/index.html | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 4a45f11..f38fb96 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -219,10 +219,11 @@ sudo apt-get install git
 cd /var/www/
 
 # install infragram in the web public folder:
+echo "Installing infragram"
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install
-cd /
+cd /var/www/
 
 echo "Installing image-sequencer"
 # install image-sequencer in the web public folder:
diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 1e90121..61fa061 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -28,9 +28,9 @@ <h2>Public Lab Pi Camera Kit</h2>
 
     <p>While connected to this camera, you won't have regular internet access.</p>
 
-    <p><a href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
-    <p><a href="http://pi.local/cam/">Access the camera</a></p>
-    <p><a href="http://pi.local/image-sequencer/examples/">Access Image Sequencer software</a></p>
+    <p><a class="btn" href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
+    <p><a class="btn" href="http://pi.local/cam/">Access the camera</a></p>
+    <p><a class="btn" href="http://pi.local/image-sequencer/examples/">Access Image Sequencer software</a></p>
     
   </body>
 </html>

From a30c924c44d17754a70cb687d233cf3194c663af Mon Sep 17 00:00:00 2001
From: jywarren <jeff@unterbahn.com>
Date: Sat, 17 Nov 2018 13:29:43 -0500
Subject: [PATCH 11/23] tweak to rebuild w/ new image sequencer

---
 builder/chroot-script.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index f38fb96..b9e9b21 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -230,7 +230,6 @@ echo "Installing image-sequencer"
 git clone https://github.com/publiclab/image-sequencer.git
 cd image-sequencer
 npm install
-
 cd /
 
 echo "Installing rpi-serial-console script"

From 11c7d2be32ca7af82b982273b4a0254a5213a99f Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Fri, 21 Jun 2019 16:44:16 -0400
Subject: [PATCH 12/23] Trigger rebuild

---
 builder/files/var/www/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 61fa061..432dbe9 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -31,6 +31,6 @@ <h2>Public Lab Pi Camera Kit</h2>
     <p><a class="btn" href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
     <p><a class="btn" href="http://pi.local/cam/">Access the camera</a></p>
     <p><a class="btn" href="http://pi.local/image-sequencer/examples/">Access Image Sequencer software</a></p>
-    
+
   </body>
 </html>

From 0bf4bce02bd1bd145bac6dca82873a7258248071 Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@fuentelibre.org>
Date: Tue, 16 Jul 2019 03:03:31 -0500
Subject: [PATCH 13/23] Fix build!

---
 versions.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.config b/versions.config
index 4f2cbe5..b7450ce 100644
--- a/versions.config
+++ b/versions.config
@@ -8,7 +8,7 @@ RAW_IMAGE_VERSION="master"
 RAW_IMAGE_CHECKSUM="e32c0b9f3cdb9c60bad97a724103fc1283cdc135848e6142d588cd96fac1d6a8"
 
 # specific versions of kernel/firmware and docker tools
-export KERNEL_BUILD="1.20190517-1"
+export KERNEL_BUILD="1.20190709~stretch-1"
 # For testing a new kernel, use the CircleCI artifacts URL.
 # export KERNEL_URL=https://62-32913687-gh.circle-artifacts.com/0/home/circleci/project/output/20180320-092128/raspberrypi-kernel_20180320-092128_armhf.deb
 # export KERNEL_VERSION="4.14.98"

From 3244044a8fc75e1e68f1f10d6d46b198e83980c6 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Tue, 16 Jul 2019 15:53:38 -0400
Subject: [PATCH 14/23] sudo apt-get install -y build-essential libxi-dev
 libglu1-mesa-dev libglew-dev pkg-config

---
 builder/chroot-script.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index b9e9b21..cf12b50 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -219,6 +219,8 @@ sudo apt-get install git
 cd /var/www/
 
 # install infragram in the web public folder:
+# prerequisites:
+sudo apt-get install -y build-essential libxi-dev libglu1-mesa-dev libglew-dev pkg-config
 echo "Installing infragram"
 git clone https://github.com/publiclab/infragram.git
 cd infragram

From 3c390c0b08d712743337a839d091a2e63ed706a1 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Wed, 17 Jul 2019 09:45:22 -0400
Subject: [PATCH 15/23] Add python2.7

---
 builder/chroot-script.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index cf12b50..a9ec5ba 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -220,8 +220,8 @@ cd /var/www/
 
 # install infragram in the web public folder:
 # prerequisites:
-sudo apt-get install -y build-essential libxi-dev libglu1-mesa-dev libglew-dev pkg-config
-echo "Installing infragram"
+sudo apt-get install -y build-essential libxi-dev libglu1-mesa-dev libglew-dev pkg-config python2.7 python2.7-dev
+cho "Installing infragram"
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install

From fcfa38f1e94059e409f15dc4a49d156fa3a62fa9 Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@fuentelibre.org>
Date: Fri, 19 Jul 2019 02:59:25 -0500
Subject: [PATCH 16/23] Fix typo

---
 builder/chroot-script.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index a9ec5ba..770bb05 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -221,7 +221,6 @@ cd /var/www/
 # install infragram in the web public folder:
 # prerequisites:
 sudo apt-get install -y build-essential libxi-dev libglu1-mesa-dev libglew-dev pkg-config python2.7 python2.7-dev
-cho "Installing infragram"
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install

From ca35fc94fef50f915ed55685c1e865a17669c33d Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@fuentelibre.org>
Date: Fri, 19 Jul 2019 15:45:23 -0500
Subject: [PATCH 17/23] Try regular python package

---
 builder/chroot-script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 770bb05..c3161f3 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -220,7 +220,7 @@ cd /var/www/
 
 # install infragram in the web public folder:
 # prerequisites:
-sudo apt-get install -y build-essential libxi-dev libglu1-mesa-dev libglew-dev pkg-config python2.7 python2.7-dev
+sudo apt-get install -y build-essential libxi-dev libglu1-mesa-dev libglew-dev pkg-config python python-dev
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install

From a7a95beeeca88e97c0c6f8b56976b5659069acfe Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Thu, 1 Aug 2019 14:31:26 +0300
Subject: [PATCH 18/23] changed to python2.7 python2.7-dev

---
 builder/chroot-script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index c3161f3..6b32e0d 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -220,7 +220,7 @@ cd /var/www/
 
 # install infragram in the web public folder:
 # prerequisites:
-sudo apt-get install -y build-essential libxi-dev libglu1-mesa-dev libglew-dev pkg-config python python-dev
+sudo apt-get install -y build-essential libxi-dev libgl1-mesa-dev libglew-dev pkg-config python2.7 python2.7-dev
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install

From 8fdb1c3f095202357ab282dbabb006439b90eec5 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Thu, 1 Aug 2019 14:43:18 +0300
Subject: [PATCH 19/23] install spectral-workbench.js

---
 builder/chroot-script.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 6b32e0d..00209ab 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -233,6 +233,13 @@ cd image-sequencer
 npm install
 cd /
 
+echo "Installing spectral-workbench.js"
+# install spectral-workbench.js in the web public folder:
+git clone https://github.com/publiclab/spectral-workbench.js.git
+cd spectral-workbench.js
+npm install
+cd /
+
 echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
 chmod +x usr/local/bin/rpi-serial-console

From 96fa3e5a70bdcb38107af907ed1e40bcac7cf385 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Thu, 1 Aug 2019 14:45:16 +0300
Subject: [PATCH 20/23] update menu

---
 builder/files/var/www/index.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 432dbe9..6a02a66 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -28,9 +28,11 @@ <h2>Public Lab Pi Camera Kit</h2>
 
     <p>While connected to this camera, you won't have regular internet access.</p>
 
-    <p><a class="btn" href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
     <p><a class="btn" href="http://pi.local/cam/">Access the camera</a></p>
+    <p><a class="btn" href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
     <p><a class="btn" href="http://pi.local/image-sequencer/examples/">Access Image Sequencer software</a></p>
+    <p><a class="btn" href="http://pi.local/image-sequencer/examples/">Access Image Sequencer VR</a></p>
+    <p><a class="btn" href="http://pi.local/spectral-workbench.js/examples/capture/">Access Spectral Workbench software</a></p>
 
   </body>
 </html>

From 5806d3bdacb1bdd9c08d8ee813a94af2dd85397e Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Thu, 1 Aug 2019 17:53:22 +0300
Subject: [PATCH 21/23] back to python not python2.7

---
 builder/chroot-script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 00209ab..c12a955 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -220,7 +220,7 @@ cd /var/www/
 
 # install infragram in the web public folder:
 # prerequisites:
-sudo apt-get install -y build-essential libxi-dev libgl1-mesa-dev libglew-dev pkg-config python2.7 python2.7-dev
+sudo apt-get install -y build-essential libxi-dev libgl1-mesa-dev libglew-dev pkg-config python python-dev
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install

From 4faa6b54a3d58ea9feedaf96ba14c5c88a1a3d63 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Thu, 1 Aug 2019 17:55:43 +0300
Subject: [PATCH 22/23] revert builder/build.sh

---
 builder/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/build.sh b/builder/build.sh
index aee6799..eaf17f2 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -84,7 +84,7 @@ ls -alh /image_with_kernel_*.tar.gz
 
 # download the ready-made raw image for the RPi
 if [ ! -f "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" ]; then
-  wget -q -O "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" "https://jenkins.laboratoriopublico.org/job/image-builder-raw/ws/${RAW_IMAGE}.zip"
+  wget -q -O "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" "https://github.com/hypriot/image-builder-raw/releases/download/${RAW_IMAGE_VERSION}/${RAW_IMAGE}.zip"
 fi
 
 # verify checksum of the ready-made raw image

From 473fbd4923123c9a39c8c3f322d2dfe2610bfbbc Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Thu, 1 Aug 2019 17:57:27 +0300
Subject: [PATCH 23/23] revert versions.config

---
 versions.config | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/versions.config b/versions.config
index b7450ce..dbe6c04 100644
--- a/versions.config
+++ b/versions.config
@@ -4,11 +4,11 @@ ROOTFS_TAR_CHECKSUM="d1e7e6d48a25b4a206c5df99ecb8815388ec6945e4f97e78413d5a80778
 
 # name of the ready made raw image for RPi
 RAW_IMAGE="rpi-raw.img"
-RAW_IMAGE_VERSION="master"
-RAW_IMAGE_CHECKSUM="e32c0b9f3cdb9c60bad97a724103fc1283cdc135848e6142d588cd96fac1d6a8"
+RAW_IMAGE_VERSION="v0.2.2"
+RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1c2c6"
 
 # specific versions of kernel/firmware and docker tools
-export KERNEL_BUILD="1.20190709~stretch-1"
+export KERNEL_BUILD="1.20190517-1"
 # For testing a new kernel, use the CircleCI artifacts URL.
 # export KERNEL_URL=https://62-32913687-gh.circle-artifacts.com/0/home/circleci/project/output/20180320-092128/raspberrypi-kernel_20180320-092128_armhf.deb
 # export KERNEL_VERSION="4.14.98"