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

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

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index f9ac33b..4878b95 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -205,6 +205,13 @@ lighttpd-enable-mod fastcgi-php
 systemctl disable dhcpcd
 systemctl disable hciuart
 
+echo "Installing infragram"
+
+git clone https://github.com/publiclab/infragram.git
+cd infragram
+npm install
+npm start
+
 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 2bdabb026bf658d66c02bf6b02bf9400c4675b37 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Mon, 22 Oct 2018 18:32:17 -0400
Subject: [PATCH 2/9] Update index.html

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

diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 2dc1ada..ae4f826 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -18,5 +18,7 @@ <h2>Public Lab Pi Camera Kit</h2>
     <p><i>You've correctly connected to your Pi!</i></p>
     <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><a href="http://pi.local:8000/">Access Infragram software</a></p>
+    
   </body>
 </html>

From 963f8c0b03933fb85e5b4797c8307473e87c9f12 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Mon, 22 Oct 2018 18:32:47 -0400
Subject: [PATCH 3/9] Update index.html

---
 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 ae4f826..04be8ee 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -18,7 +18,7 @@ <h2>Public Lab Pi Camera Kit</h2>
     <p><i>You've correctly connected to your Pi!</i></p>
     <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><a href="http://pi.local:8000/">Access Infragram software</a></p>
+    <p><a href="http://pi.local/infragram/">Access Infragram software</a></p>
     
   </body>
 </html>

From c865f06d9d9fcd1bd547708eeacf5f10dc0d8ff7 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Mon, 22 Oct 2018 18:34:06 -0400
Subject: [PATCH 4/9] Update chroot-script.sh

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

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 4878b95..5e64373 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -207,10 +207,12 @@ systemctl disable hciuart
 
 echo "Installing infragram"
 
+cd /var/www/
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install
-npm start
+npm i -g http-server ; http-server -p 8000
+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

From cd0f4170d5896c340e987ff169d0c3fd50d441ad Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Tue, 23 Oct 2018 11:34:56 -0400
Subject: [PATCH 5/9] Update chroot-script.sh

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

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 5e64373..a8da619 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -207,6 +207,7 @@ systemctl disable hciuart
 
 echo "Installing infragram"
 
+sudo apt-get install nodejs npm node-semver
 cd /var/www/
 git clone https://github.com/publiclab/infragram.git
 cd infragram

From 60701db18b45cbd4f5fe4bc38090369c5a244bd0 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Tue, 23 Oct 2018 18:42:09 -0400
Subject: [PATCH 6/9] Update chroot-script.sh

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

diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index a8da619..d149006 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -207,12 +207,17 @@ systemctl disable hciuart
 
 echo "Installing infragram"
 
-sudo apt-get install nodejs npm node-semver
+# 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
-npm i -g http-server ; http-server -p 8000
 cd
 
 echo "Installing rpi-serial-console script"

From 4396441b8c8a4324be1642bd3bbcbaae16f5e269 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Tue, 23 Oct 2018 19:30:23 -0400
Subject: [PATCH 7/9] Update chroot-script.sh

---
 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 d149006..0332aa1 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -218,7 +218,7 @@ cd /var/www/
 git clone https://github.com/publiclab/infragram.git
 cd infragram
 npm install
-cd
+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

From bd98bbeea44471d14edd9464455b3f81294ddc95 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Wed, 24 Oct 2018 14:29:38 -0400
Subject: [PATCH 8/9] Update build.sh

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

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

From e0b09b0c9c3316d059d855484a8926fda5ad4709 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Wed, 24 Oct 2018 15:36:20 -0400
Subject: [PATCH 9/9] Update versions.config

---
 versions.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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"