From daa199a9c35e28bd9a64cbd8c5bdbac977c911b6 Mon Sep 17 00:00:00 2001 From: discipolo Date: Thu, 19 May 2016 20:37:14 +0200 Subject: [PATCH] Issue #91 add arch support to installer --- bin/dsh | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/bin/dsh b/bin/dsh index c23eb75..9a98601 100755 --- a/bin/dsh +++ b/bin/dsh @@ -665,7 +665,14 @@ install_prerequisites () bash <(echo "$presetup_script") read -p "Press enter after the installation in another console window is done..." elif is_linux ; then + if lsb_release -a | grep -q Manjaro; then + #install arch for arch-systems + install_arch + + else # Ubuntu install_ubuntu + + fi else # mac local presetup_script presetup_script=$(curl -fsS https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/$B2D_BRANCH/scripts/presetup-mac.sh) @@ -687,6 +694,60 @@ install_dns_service () sudo docker run -d --name dns -p 192.168.10.10:53:53/udp --cap-add=NET_ADMIN --dns 8.8.8.8 --restart=always \ -v /var/run/docker.sock:/var/run/docker.sock blinkreaction/dns-discovery:stable } +install_arch () +{ + + + echo-green "Installing Docker..." + curl -sSL https://get.docker.com/ | sh && \ + sudo usermod -aG docker $(whoami) && \ + sudo docker version + if_failed "Docker installation/upgrade failed." + + echo-green "Installing Docker Compose..." + sudo curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose && \ + sudo chmod +x /usr/local/bin/docker-compose && \ + docker-compose --version + if_failed "Docker Compose installation/upgrade failed." + + echo-green "Adding a subnet for Drude..." + ip_mask="192.168.10.1/24" + sudo ip addr add 192.168.10.1/24 broadcast 192.168.10.255 dev lo + # Make sure we don't do this twice + if [ ! -e /etc/systemd/network/lo.network ] + then + cat > /tmp/drude.ip.addr <