Skip to content
This repository has been archived by the owner on Dec 1, 2018. It is now read-only.

Issue #91 Add manjaro compatibility to sinstall_prerequisites. #92

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Issue #91 Add manjaro compatibility to sinstall_prerequisites. #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions bin/dsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 <<EOF
[Match]
Name=lo
Virtualizaiton=yes
[Network]
Address=$ip_mask
Gateway=$ip_mask
IPForward=kernel
EOF
# place the contents of the temp file into the network file
sudo cp /tmp/drude.ip.addr /etc/systemd/network/lo.network
rm -f /tmp/drude.ip.addr
sudo ip link set lo down && sudo ip link set lo up
if_failed "Docker subnet configuration failed."
fi
sudo systemctl enable systemd-networkd.service
sudo systemctl start systemd-networkd.service

echo-green "Creating Drude HTTP/HTTPS reverse proxy..."
install_proxy_service
if_failed "Drude HTTP/HTTPS reverse proxy setup failed."

echo-green "Creating Drude DNS service..."
install_dns_service
if_failed "Drude DNS service setup failed."

echo-green "Configuring host DNS resolver for .drude domain..."
echo -e "\n# .drude domain resolution\nnameserver 192.168.10.10" | sudo tee -a /etc/resolvconf/resolv.conf.d/head
sudo resolvconf -u

echo-green "To run docker without sudo please re-login or run 'newgrp docker' now."
}

# Install Docker and setup Drude on Ubuntu 14.04+
install_ubuntu ()
Expand Down