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 7b64fd2..f2ce33b 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -208,17 +208,18 @@ lighttpd-enable-mod fastcgi-php systemctl disable dhcpcd systemctl disable hciuart - echo "Installing infragram" +echo "Installing infragram" - # install npm/node: +# 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 - cd /var/www/ +# install infragram in the web public folder: +cd /var/www/ - # install infragram in the web public folder: +# install infragram in the web public folder: echo "Installing infragram" git clone https://github.com/publiclab/infragram.git cd infragram 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 @@

Public Lab Pi Camera Kit

If you're seeing this in a pop-up, close it and open http://pi.local in a browser.

On Android devices, you may have to turn off cellular data to use this in a browser.

-

While connected to this camera, you won't have regular internet access.

+

Access Infragram software

+

Access the camera

+ 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"