From: David Zafman <dzafman@redhat.com>
Date: Tue, 1 May 2018 20:59:04 +0000 (-0700)
Subject: script: Fix ceph-debug-docker.sh script create --tag in correct format
X-Git-Tag: v14.0.0~226^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de7eecd7eba2ba59b96df0bacd7a2e1c1253f219;p=ceph.git

script: Fix ceph-debug-docker.sh script create --tag in correct format

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/script/ceph-debug-docker.sh b/src/script/ceph-debug-docker.sh
index b0c1ffc4f599..083c0ef20c2b 100755
--- a/src/script/ceph-debug-docker.sh
+++ b/src/script/ceph-debug-docker.sh
@@ -74,7 +74,7 @@ function main {
         user="$(whoami)"
     fi
 
-    image="${user}/ceph-ci:${branch}:${sha}-${env/:/-}"
+    tag="${user}:ceph-ci-${branch}-${sha}-${env/:/-}"
 
     T=$(mktemp -d)
     pushd "$T"
@@ -93,9 +93,9 @@ RUN add-apt-repository "\$(wget --quiet -O - https://shaman.ceph.com/api/repos/c
     apt-get update --yes && \
     apt-get install --yes --allow-unauthenticated ceph ceph-osd-dbg ceph-mds-dbg ceph-mgr-dbg ceph-mon-dbg ceph-fuse-dbg ceph-test-dbg radosgw-dbg
 EOF
-        time run docker build $CACHE --tag "$image" .
+        time run docker build $CACHE --tag "$tag" .
     else # try RHEL flavor
-        time run docker build $CACHE --tag "$image" - <<EOF
+        time run docker build $CACHE --tag "$tag" - <<EOF
 FROM ${env}
 
 WORKDIR /root
@@ -110,9 +110,9 @@ EOF
     popd
     rm -rf -- "$T"
 
-    printf "built image %s\n" "$image"
+    printf "built image %s\n" "$tag"
 
-    run docker run -ti -v /ceph:/ceph:ro "$image"
+    run docker run -ti -v /ceph:/ceph:ro "$tag"
     return 0
 }