From 62ea0105f1bdcc3d856015c646a77998c0c89f5f Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Wed, 22 Jul 2020 21:41:41 +0800
Subject: [PATCH] ceph-debug-docker: support centos 8

* default to centos:8, as we've moved to centos:8 now
* do not assume that the base image is centos:7, use centos:8 if it is
  specified.
* install python3-* packages for centos:8 and install python36-*
  packages for centos:7. as el8 is now a python3 distro, and
  centos:7 now has python36.
* s/screen/tmux/. because screen is now offered by EPEL, while tmux
  is in BaseOS.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/script/ceph-debug-docker.sh | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/script/ceph-debug-docker.sh b/src/script/ceph-debug-docker.sh
index eac98183eeec2..3751845e171ab 100755
--- a/src/script/ceph-debug-docker.sh
+++ b/src/script/ceph-debug-docker.sh
@@ -57,10 +57,10 @@ function main {
     printf "branch: %s\nsha1: %s\n" "$branch" "$sha"
 
     if [ -z "$2" ]; then
-        printf "specify the build environment [default \"centos:7\"]: "
+        printf "specify the build environment [default \"centos:8\"]: "
         read env
         if [ -z "$env" ]; then
-            env=centos:7
+            env=centos:8
         fi
     else
         env="$2"
@@ -96,16 +96,27 @@ RUN apt-key add cephdev.asc && \
 EOF
         time run docker build $CACHE --tag "$tag" .
     else # try RHEL flavor
+        case "$env" in
+            centos:7)
+                python_bindings="python36-rados python36-cephfs"
+                ceph_debuginfo="ceph-debuginfo"
+                ;;
+            centos:8)
+                python_bindings="python3-rados python3-cephfs"
+                ceph_debuginfo="ceph-base-debuginfo"
+                ;;
+        esac
+        IFS=":" read -r distro distro_release <<< "$env"
         time run docker build $CACHE --tag "$tag" - <<EOF
 FROM ${env}
 
 WORKDIR /root
 RUN yum update -y && \
-    yum install -y screen epel-release wget psmisc ca-certificates gdb
-RUN wget -O /etc/yum.repos.d/ceph-dev.repo https://shaman.ceph.com/api/repos/ceph/${branch}/${sha}/centos/7/repo && \
+    yum install -y tmux epel-release wget psmisc ca-certificates gdb
+RUN wget -O /etc/yum.repos.d/ceph-dev.repo https://shaman.ceph.com/api/repos/ceph/${branch}/${sha}/${distro}/${distro_release}/repo && \
     yum clean all && \
     yum upgrade -y && \
-    yum install -y ceph ceph-debuginfo ceph-fuse python34-rados python34-cephfs
+    yum install -y ceph ${ceph_debuginfo} ceph-fuse ${python_bindings}
 EOF
     fi
     popd
-- 
2.39.5