From 1efeedd22ff9752b01f89bb633a0fd127bc4d061 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 7 Aug 2018 18:59:37 -0400 Subject: [PATCH] SO Setup - Add some logic to docker_install --- so-setup-network.sh | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/so-setup-network.sh b/so-setup-network.sh index 953cdf43a..1296a5730 100644 --- a/so-setup-network.sh +++ b/so-setup-network.sh @@ -437,13 +437,22 @@ saltify() { } docker_install() { - apt-key add $TMP/gpg/docker.pub - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - apt-get update >>~/sosetup.log 2>&1 - apt-get -y install docker-ce >>~/sosetup.log 2>&1 - docker_registry - echo "Restarting Docker" - systemctl restart docker + + if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then + apt-get update >>~/sosetup.log 2>&1 + apt-get -y install docker-ce >>~/sosetup.log 2>&1 + docker_registry + echo "Restarting Docker" + systemctl restart docker + else + apt-key add $TMP/gpg/docker.pub + add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + apt-get update >>~/sosetup.log 2>&1 + apt-get -y install docker-ce >>~/sosetup.log 2>&1 + docker_registry + echo "Restarting Docker" + systemctl restart docker + } salt_firstcheckin() {