From ab5d84cdea3da617c64444a9f43b74d0cfa7897c Mon Sep 17 00:00:00 2001
From: Mark Grondona <mark.grondona@gmail.com>
Date: Thu, 18 Apr 2019 00:42:54 +0000
Subject: [PATCH] travis-ci: add -v0.11 prefix to -latest docker tag

For builds on flux-core-v0.11 master, tag the docker images
as flux-core:${IMAGE}-v0.11-latest, so as not to overwrite
the flux-core unstable repo docker images.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8dc40fe655d5..db66fa44ecad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,6 +94,7 @@ env:
   global:
    - TAP_DRIVER_QUIET=1
    - DOCKERREPO=fluxrm/flux-core
+   - DOCKER_STABLE_PREFIX=-v0.11
    - DOCKER_USERNAME=travisflux
    # travis encrypt -r flux-framework/flux-core-v0.11
    # DOCKER_PASSWORD=xxxx
@@ -149,7 +150,7 @@ after_success:
      docker push ${TAGNAME}
      # If this is the bionic-base build, then also tag without image name:
      if echo "$TAGNAME" | grep -q "bionic-base"; then
-       t="${DOCKERREPO}:${TRAVIS_TAG:-latest}"
+       t="${DOCKERREPO}:${TRAVIS_TAG:${DOCKER_STABLE_PREFIX}-latest}"
        docker tag "$TAGNAME" ${t} && \
        docker push ${t}
      fi