Update bennu build scripts (#3)

* install labjack dependencies for siren and fix dpkg config

* update bennu build script to handle bennu deb package versions

* Fix aptly and bennu install
aptly requires updated ca-certificates for repo https cert

* bennu: --force-bad-version no longer needed for bennu deb install

README.md

@@ -21,7 +21,7 @@ In step 1, the tool compiles command line arguments, scripts, and filesystem ove
 - Official SCEPTRE image used for running bennu in experiments (includes brash shell)
 
     ```bash
-    phenix image create -O /phenix/vmdb2/overlays/bennu,/phenix/vmdb2/overlays/brash -T /phenix/vmdb2/scripts/aptly,/phenix/vmdb2/scripts/bennu --format qcow2 --release focal -c bennu
+    phenix image create -O /phenix/vmdb2/overlays/bennu,/phenix/vmdb2/overlays/brash -T /phenix/vmdb2/scripts/aptly,/phenix/vmdb2/scripts/bennu --format qcow2 --release focal -c bennu --size 10G
     phenix image build bennu -o /phenix -c -x
     ```
 

scripts/aptly

@@ -1,9 +1,15 @@
 set -x
-apt install -y gnupg2 lsb-release
+export DEBIAN_FRONTEND=noninteractive
 mv /etc/apt/sources.list /etc/apt/sources.list_backup
 . /etc/lsb-release
 cat <<EOF >> /etc/apt/sources.list
-deb [arch=amd64 trusted=yes] http://archive.ubuntu.com/ubuntu/ focal main restricted universe
+deb [arch=amd64 trusted=yes] http://archive.ubuntu.com/ubuntu/ $DISTRIB_CODENAME main restricted universe
+deb [arch=amd64 trusted=yes] http://archive.ubuntu.com/ubuntu/ $DISTRIB_CODENAME-updates main restricted universe
+deb [arch=amd64 trusted=yes] http://archive.ubuntu.com/ubuntu/ $DISTRIB_CODENAME-security main restricted universe
+EOF
+apt-get update && apt-get install -y gnupg2 lsb-release ca-certificates apt-transport-https && apt-get clean
+cat <<EOF >> /etc/apt/sources.list.d/aptly.list
 deb [arch=amd64 trusted=yes] https://apt.sceptre.dev /
 EOF
+
 apt-get update

scripts/bennu

@@ -2,7 +2,17 @@ set -x
 export LC_ALL=C
 export DEBIAN_FRONTEND=noninteractive
 ln -fs /usr/share/zoneinfo/America/Denver /etc/localtime
-apt-get install -y --no-install-recommends -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" bennu collectd ftp pv pybennu python3 python3-pip python3-setuptools python3-twisted python3-wheel socat systemd-timesyncd tcpdump tmux telnet vsftpd wget iperf3
+apt-get install -y --no-install-recommends -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" bennu collectd ftp pv pybennu python3 python3-pip python3-setuptools python3-twisted python3-wheel socat systemd-timesyncd tcpdump tmux telnet vsftpd wget iperf3 ca-certificates && apt-get clean
+
+# install labjack libraries for pybennu-siren
+PREV="$(pwd)"
+mkdir -p /tmp/labjack
+cd /tmp/labjack
+wget -q https://files.labjack.com/installers/LJM/Linux/x64/release/labjack_ljm_software_2019_07_16_x86_64.tar.gz -O labjack.tar.gz
+tar -xaf labjack.tar.gz
+./labjack_ljm_software_2019_07_16_x86_64/labjack_ljm_installer.run
+cd "$PREV"
+rm -r /tmp/labjack
 
 pip3 install --trusted-host pypi.org --trusted-host files.pythonhosted.org ipython pymodbus
 apt-get autoremove -y