diff --git a/README.md b/README.md index ba54a69..b52ea72 100644 --- a/README.md +++ b/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 ``` diff --git a/scripts/aptly b/scripts/aptly index 973eb89..e3137c9 100755 --- a/scripts/aptly +++ b/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 <> /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 <> /etc/apt/sources.list.d/aptly.list deb [arch=amd64 trusted=yes] https://apt.sceptre.dev / EOF + apt-get update diff --git a/scripts/bennu b/scripts/bennu index 46bc039..f7d3b63 100755 --- a/scripts/bennu +++ b/scripts/bennu @@ -3,15 +3,16 @@ export LC_ALL=C export DEBIAN_FRONTEND=noninteractive ln -fs /usr/share/zoneinfo/America/Denver /etc/localtime # force-bad-version required for bennu versioning (non-numeric) -apt-get install -y --no-install-recommends -o Dpkg::Options::="--force-bad-version" -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 install -y --no-install-recommends -o Dpkg::Options::="--force-bad-version" -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 -pushd /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 -popd +cd "$PREV" rm -r /tmp/labjack pip3 install --trusted-host pypi.org --trusted-host files.pythonhosted.org ipython pymodbus