Skip to content

add support for specify a CIDR for the docker0 iface #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

add support for specify a CIDR for the docker0 iface #78

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
39 changes: 32 additions & 7 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,25 @@ install_docker () {
sudo chmod +x /usr/local/bin/docker-compose
sudo docker-compose --version
fi

# Setup daemon.json if an CIDR has specified
if [ -n "$DOCKER_CIDR" ]; then
echo "## Configuring Docker daemon with CIDR $DOCKER_CIDR..."
DOCKER_BIP="${DOCKER_CIDR%.*}.1/24"
DOCKER_BASE="${DOCKER_CIDR%.*}.0/16"
DAEMON_JSON="/etc/docker/daemon.json"
sudo mkdir -p "$(dirname $DAEMON_JSON)"
cat << EOF | sudo tee $DAEMON_JSON
{
"bip": "${DOCKER_BIP}",
"default-address-pools": [
{"base": "${DOCKER_BASE}", "size": 24}
],
"mtu": 9000
}
EOF
sudo systemctl restart docker
fi
}

setup_docker () {
Expand Down Expand Up @@ -423,25 +442,29 @@ nomad_install () {
}

FORCE_INSTALL="n"
DOCKER_CIDR=""

while getopts ":hy" opt; do
while getopts ":hyc:" opt; do
case ${opt} in
h )
echo "Usage:"
echo " install.sh -h Display this help message."
echo " install.sh [-y] docker [OPTIONS] Install with docker-compose."
echo " install.sh [-y] systemd Install as systemd service."
echo " install.sh [-y] nomad Install as nomad job."

echo " install.sh [-y] [-c CIDR] docker [OPTIONS] Install with docker-compose."
echo " install.sh [-y] [-c CIDR] systemd Install as systemd service."
echo " install.sh [-y] [-c CIDR] nomad Install as nomad job."
echo " Options: "
echo " docker:"
echo " -d Development mode "
echo " -b Build containers"
echo " -c CIDR Specify Docker CIDR (e.g., 10.10.0.0/16)"
exit 0
;;
y )
FORCE_INSTALL="y"
;;
c )
DOCKER_CIDR="$OPTARG"
;;
\? )
echo "Invalid Option: -$OPTARG" 1>&2
exit 1
Expand All @@ -453,21 +476,23 @@ while getopts ":hy" opt; do
esac
done
shift $((OPTIND -1))
OPTIND=1
INSTALL_TYPE="${1:-docker}"
if [[ $# > 0 ]]; then shift; fi

if [ $INSTALL_TYPE = "docker" ]; then
DOCKER_DEV=false
DOCKER_BUILD=false
while getopts ":db" opt; do
while getopts ":dbc:" opt; do
case ${opt} in
d )
DOCKER_DEV=true
;;
b )
DOCKER_BUILD=true
;;
c )
DOCKER_CIDR="$OPTARG"
;;
\? )
echo "Invalid Option for \"docker\": -$OPTARG" 1>&2
exit 1
Expand Down