From e33e3a931db97d01318643ec686fe63fdd614082 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 22 Mar 2021 14:07:54 +0800 Subject: [PATCH] ceph.spec,install-deps: use golang-github-prometheus for promtools instead of installing docker for using promtools, install golang-github-prometheus. Signed-off-by: Aashish Sharma Signed-off-by: Kefu Chai --- ceph.spec.in | 2 ++ install-deps.sh | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index a9fb3bea2c093..4197d5ee5b361 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -354,6 +354,7 @@ BuildRequires: lz4-devel >= 1.7 # distro-conditional make check dependencies %if 0%{with make_check} %if 0%{?fedora} || 0%{?rhel} +BuildRequires: golang-github-prometheus BuildRequires: libtool-ltdl-devel BuildRequires: ninja-build BuildRequires: xmlsec1 @@ -371,6 +372,7 @@ BuildRequires: python%{python3_pkgversion}-werkzeug BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif %if 0%{?suse_version} +BuildRequires: golang-github-prometheus-prometheus BuildRequires: libxmlsec1-1 BuildRequires: libxmlsec1-nss1 BuildRequires: libxmlsec1-openssl1 diff --git a/install-deps.sh b/install-deps.sh index 7911bcb405ba9..a5e19998f17b1 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -348,9 +348,6 @@ else case "$ID" in fedora) $SUDO dnf install -y dnf-utils - $SUDO dnf install -y docker-ce docker-ce-cli containerd.io - $SUDO systemctl start docker - $SUDO systemctl enable docker ;; centos|rhel|ol|virtuozzo) MAJOR_VERSION="$(echo $VERSION_ID | cut -d. -f1)" -- 2.39.5