From 28905a43191cdc13911d5b83e7ce320c45ae3e52 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 13 Jan 2020 16:07:08 -0500 Subject: [PATCH] Fix docker seed --- setup/functions.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/setup/functions.sh b/setup/functions.sh index e0fb60b0f..dd476bd9e 100644 --- a/setup/functions.sh +++ b/setup/functions.sh @@ -409,21 +409,24 @@ docker_install() { yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo yum -y update yum -y install docker-ce python36-docker -# if [ $INSTALLTYPE != 'EVALMODE' ]; then -# docker_registry -# fi - docker_registry - echo "Restarting Docker" >> $SETUPLOG 2>&1 - systemctl restart docker - systemctl enable docker + if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then + docker_registry + echo "Restarting Docker" >> $SETUPLOG 2>&1 + systemctl restart docker + systemctl enable docker + docker_seed_registry >> $SETUPLOG 2>&1 + else + docker_registry + echo "Restarting Docker" >> $SETUPLOG 2>&1 + systemctl restart docker + systemctl enable docker + fi else + if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then apt-get update >> $SETUPLOG 2>&1 apt-get -y install docker-ce python3-docker >> $SETUPLOG 2>&1 -# if [ $INSTALLTYPE != 'EVALMODE' ]; then -# docker_registry >> $SETUPLOG 2>&1 -# fi docker_registry >> $SETUPLOG 2>&1 echo "Seeding the registry. This can take a bit" >> $SETUPLOG 2>&1 docker_seed_registry >> $SETUPLOG 2>&1