From 5ae9dd6a0d50adcf39dee6ff958d04ae15bd7ecf Mon Sep 17 00:00:00 2001 From: binhex Date: Thu, 14 Feb 2019 13:16:01 +0000 Subject: [PATCH] call new pacman updater script --- build/root/install.sh | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/build/root/install.sh b/build/root/install.sh index 0977c5f..bea8585 100644 --- a/build/root/install.sh +++ b/build/root/install.sh @@ -3,21 +3,6 @@ # exit script if return code != 0 set -e -# we cannot build from src currently due to this issue:- https://stackoverflow.com/questions/51027703/mxe-qt5-application-builds-fail-in-docker-container -# we cannot use aur as this is not headless version and also doesnt build (see above). -# we cannot use pacman as qbittorrent could be out of date (pointing at archive) -# we cannot pull packages from aor as this may cause a package mismatch (due to point in time archive) - -# due to the above we are resetting to live repo and using pacman for this app. -echo 'Server = http://mirror.bytemark.co.uk/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist -echo 'Server = http://archlinux.mirrors.uk2.net/$repo/os/$arch' >> /etc/pacman.d/mirrorlist - -# download fresh package databases from the server -pacman -Fyy --noconfirm - -# sync package databases for pacman -pacman -Syyu --noconfirm - # build scripts #### @@ -33,6 +18,9 @@ mv /tmp/scripts-master/shell/arch/docker/*.sh /root/ # pacman packages #### +# call pacman db and package updater script +source /root/upd.sh + # define pacman packages pacman_packages="qbittorrent-nox python unrar geoip gnu-netcat ipcalc"