From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 25 Jun 2018 20:06:02 +0000 (-0700)
Subject: scripts: add ceph-common-dbg to debug packages
X-Git-Tag: v14.0.1~1027^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc41b9882249b4ad931731a772b29f4ea95ac706;p=ceph.git

scripts: add ceph-common-dbg to debug packages

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/script/ceph-debug-docker.sh b/src/script/ceph-debug-docker.sh
index 083c0ef20c2b..bac2cee71aae 100755
--- a/src/script/ceph-debug-docker.sh
+++ b/src/script/ceph-debug-docker.sh
@@ -48,8 +48,9 @@ function main {
     else
         branch="$1"
     fi
-    sha=${branch##*:}
-    if [ -z "$sha" ]; then
+    if [ "${branch%%:*}" != "${branch}" ]; then
+        sha=${branch##*:}
+    else
         sha=latest
     fi
     branch=${branch%%:*}
@@ -86,12 +87,12 @@ FROM ${env}
 
 WORKDIR /root
 RUN apt-get update --yes --quiet && \
-    apt-get install --yes --quiet screen wget gdb software-properties-common python-software-properties apt-transport-https
+    apt-get install --yes --quiet screen gdb software-properties-common apt-transport-https curl
 COPY cephdev.asc cephdev.asc
-RUN apt-key add cephdev.asc
-RUN add-apt-repository "\$(wget --quiet -O - https://shaman.ceph.com/api/repos/ceph/${branch}/${sha}/${env/://}/repo)" && \
+RUN apt-key add cephdev.asc && \
+    curl -L https://shaman.ceph.com/api/repos/ceph/${branch}/${sha}/${env/://}/repo | tee /etc/apt/sources.list.d/ceph_dev.list && \
     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
+    DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get --assume-yes -q --no-install-recommends install -o Dpkg::Options::=--force-confnew --allow-unauthenticated ceph ceph-osd-dbg ceph-mds-dbg ceph-mgr-dbg ceph-mon-dbg ceph-common-dbg ceph-fuse-dbg ceph-test-dbg radosgw-dbg
 EOF
         time run docker build $CACHE --tag "$tag" .
     else # try RHEL flavor