]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
script: Fix ceph-debug-docker.sh script create --tag in correct format 21759/head
authorDavid Zafman <dzafman@redhat.com>
Tue, 1 May 2018 20:59:04 +0000 (13:59 -0700)
committerDavid Zafman <dzafman@redhat.com>
Tue, 1 May 2018 20:59:04 +0000 (13:59 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
src/script/ceph-debug-docker.sh

index b0c1ffc4f5993e9341743b97cf39d1cdb935c88f..083c0ef20c2bc5c882ae4b291a7d7cc9dd50fc90 100755 (executable)
@@ -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
 }