From 44c021904b2eec4520dc5aef58d1de43ce62dd12 Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 9 Dec 2019 01:36:57 +0100
Subject: [PATCH] Installer and docker-compose updated to work with Rel SEVEN
 repo and tags

Change-Id: I914d5517cf3f6e94e4bc96675cf6cb551e10dd0b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 installers/docker/docker-compose.yaml | 14 +++++++-------
 installers/full_install_osm.sh        |  6 +++---
 installers/install_osm.sh             |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index b87f27b1..c8b846d3 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -110,7 +110,7 @@ services:
     networks:
       - netOSM
   keystone:
-    image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-7}
     networks:
       - netOSM
     environment:
@@ -125,7 +125,7 @@ services:
         max-size: "100m"
         max-file: "2"
   nbi:
-    image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-7}
     networks:
       - netOSM
     volumes:
@@ -146,7 +146,7 @@ services:
     #  - kafka
     #  - mongo
   lcm:
-    image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-7}
     networks:
       - netOSM
     volumes:
@@ -184,7 +184,7 @@ services:
 #    ports:
 #      - "3306:3306"
   ro:
-    image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-7}
     networks:
       - netOSM
     environment:
@@ -203,7 +203,7 @@ services:
         max-size: "100m"
         max-file: "2"
   mon:
-    image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-7}
     networks:
       - netOSM
     volumes:
@@ -223,7 +223,7 @@ services:
             max-file: 5
             max-size: 10m
   pol:
-    image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-7}
     networks:
       - netOSM
     volumes:
@@ -242,7 +242,7 @@ services:
         max-file: 5
         max-size: 10m
   light-ui:
-    image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-7}
     networks:
       - netOSM
     environment:
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 9fe11edd..6fe5e179 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -1313,7 +1313,7 @@ function install_lightweight() {
     [ -z "$INSTALL_NOHOSTCLIENT" ] && install_osmclient
     track osmclient
 
-    wget -q -O- https://osm-download.etsi.org/ftp/osm-6.0-six/README2.txt &> /dev/null
+    wget -q -O- https://osm-download.etsi.org/ftp/osm-7.0-seven/README2.txt &> /dev/null
     track end
     return 0
 }
@@ -1674,7 +1674,7 @@ fi
 [ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
 
 #Installation starts here
-wget -q -O- https://osm-download.etsi.org/ftp/osm-6.0-six/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-7.0-seven/README.txt &> /dev/null
 track start
 
 [ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0
@@ -1730,6 +1730,6 @@ fi
 #Install vim-emu (optional)
 [ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu
 
-wget -q -O- https://osm-download.etsi.org/ftp/osm-6.0-six/README2.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-7.0-seven/README2.txt &> /dev/null
 track end
 echo -e "\nDONE"
diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index fcdcdf93..0f5e6bb0 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -13,9 +13,9 @@
 #   limitations under the License.
 #
 REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian
-RELEASE=ReleaseSIX
+RELEASE=ReleaseSEVEN
 REPOSITORY=stable
-DOCKER_TAG=6
+DOCKER_TAG=7
 
 function usage(){
     echo -e "usage: $0 [OPTIONS]"
-- 
2.25.1