From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Wed, 29 May 2019 10:23:22 +0000 (+0200)
Subject: Docker tag 6 to be used by default in installer and in dockerhub
X-Git-Tag: v6.0.0~7
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F7571%2F1;p=osm%2Fdevops.git

Docker tag 6 to be used by default in installer and in dockerhub

Change-Id: I637a32d63f171773ad947d4dd2373b1a04f1b28c
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index a6df090f..e19c7531 100644
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -4,7 +4,7 @@ MKBUILD=$(TOPDIR)/docker/build
 
 all: build
 
-TAG ?= 5
+TAG ?= 6
 
 REPOSITORY_BASE ?= http://osm-download.etsi.org/repository/osm/debian
 RELEASE         ?= ReleaseFOUR-daily
diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index f2cf7734..5a9199cb 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian
-RELEASE=ReleaseFIVE
+RELEASE=ReleaseSIX
 REPOSITORY=stable
+DOCKER_TAG=6
 
 add_repo() {
   REPO_CHECK="^$1"
@@ -31,4 +32,4 @@ add_repo() {
 add_repo "deb [arch=amd64] $REPOSITORY_BASE/$RELEASE $REPOSITORY devops"
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q update
 sudo DEBIAN_FRONTEND=noninteractive apt-get install osm-devops
-/usr/share/osm-devops/installers/full_install_osm.sh -R $RELEASE -r $REPOSITORY -u $REPOSITORY_BASE -D /usr/share/osm-devops -t latest "$@"
+/usr/share/osm-devops/installers/full_install_osm.sh -R $RELEASE -r $REPOSITORY -u $REPOSITORY_BASE -D /usr/share/osm-devops -t $DOCKER_TAG "$@"