From 4a83e6ed5721bbcb6fd1f67eda859d1bb3368cd1 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 4 Dec 2018 14:55:09 +0100 Subject: [PATCH] Fix pull ro-db docker image and TO_REBUILD options Change-Id: I225f5bcf6754f0446d8be8ee9d455516b2f4c233 Signed-off-by: garciadeblas --- installers/full_install_osm.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index b3df5881..9ff7a0af 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -32,7 +32,7 @@ function usage(){ echo -e " --vimemu: additionally deploy the VIM emulator as a docker container" echo -e " --elk_stack: additionally deploy an ELK docker stack for event logging" echo -e " --pm_stack: additionally deploy a Prometheus+Grafana stack for performance monitoring (PM)" - echo -e " -m : install OSM but only rebuild the specified docker images (RO, LCM, NBI, LW-UI, MON, KAFKA, MONGO, NONE)" + echo -e " -m : install OSM but only rebuild the specified docker images (RO, LCM, NBI, LW-UI, MON, POL, KAFKA, MONGO, PROMETHEUS, KEYSTONE-DB, NONE)" echo -e " -o : ONLY (un)installs one of the addons (vimemu, elk_stack, pm_stack)" echo -e " -D use local devops installation path" echo -e " -w Location to store runtime installation" @@ -667,10 +667,14 @@ function generate_docker_images() { sg docker -c "docker pull prom/prometheus:${PROMETHEUS_TAG}" || FATAL "cannot get prometheus docker image" fi - if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q KEYSTONE-DB ; then + if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q NBI || echo $TO_REBUILD | grep -q KEYSTONE-DB ; then sg docker -c "docker pull mariadb:${KEYSTONEDB_TAG}" || FATAL "cannot get keystone-db docker image" fi + if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q RO ; then + sg docker -c "docker pull mysql:5" || FATAL "cannot get mysql docker image" + fi + if [ -n "$PULL_IMAGES" ]; then sg docker -c "docker pull ${DOCKER_USER}/mon:${OSM_DOCKER_TAG}" || FATAL "cannot pull MON docker image" elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q MON ; then @@ -681,10 +685,10 @@ function generate_docker_images() { if [ -n "$PULL_IMAGES" ]; then sg docker -c "docker pull ${DOCKER_USER}/pol:${OSM_DOCKER_TAG}" || FATAL "cannot pull POL docker image" - elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q MON ; then + elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q POL ; then git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/POL git -C ${LWTEMPDIR}/POL checkout ${COMMIT_ID} - sg docker -c "docker build ${LWTEMPDIR}/POL -f ${LWTEMPDIR}/POL/docker/Dockerfile -t ${DOCKER_USER}/pol --no-cache" || FATAL "cannot build PM docker image" + sg docker -c "docker build ${LWTEMPDIR}/POL -f ${LWTEMPDIR}/POL/docker/Dockerfile -t ${DOCKER_USER}/pol --no-cache" || FATAL "cannot build POL docker image" fi if [ -n "$PULL_IMAGES" ]; then @@ -700,7 +704,6 @@ function generate_docker_images() { if [ -n "$PULL_IMAGES" ]; then sg docker -c "docker pull ${DOCKER_USER}/ro:${OSM_DOCKER_TAG}" || FATAL "cannot pull RO docker image" elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q RO ; then - sg docker -c "docker pull mysql:5" || FATAL "cannot get mysql docker image" git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/RO git -C ${LWTEMPDIR}/RO checkout ${COMMIT_ID} sg docker -c "docker build ${LWTEMPDIR}/RO -f ${LWTEMPDIR}/RO/docker/Dockerfile-local -t ${DOCKER_USER}/ro --no-cache" || FATAL "cannot build RO docker image" -- 2.25.1