From 37d3fbcb58ec1bcc7b0b01faed9fc8d52d111d20 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Sun, 22 May 2022 08:44:41 +0800 Subject: [PATCH] build_inf_prepare_jenkins: remove installation of docker docker-ce is already installed on CI vm: 08:45:40 Transaction check error: 08:45:40 file /usr/bin/docker from install of docker-common-2:1.13.1-209.git7d71120.el7.centos.x86_64 conflicts with file from package docker-ce-cli-1:20.10.8-3.el7.x86_64 08:45:40 file /usr/bin/dockerd from install of docker-common-2:1.13.1-209.git7d71120.el7.centos.x86_64 conflicts with file from package docker-ce-3:20.10.8-3.el7.x86_64 Issue-ID: INF-274 Signed-off-by: Jackie Huang Change-Id: Icf41b9fc4fd234720298f70ba1e4d600a6c78576 --- scripts/build_inf_centos/build_inf_prepare_jenkins.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh index 9134db0..1eeb130 100755 --- a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh +++ b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh @@ -122,7 +122,6 @@ sudo yum install -y \ createrepo \ createrepo_c \ deltarpm \ - docker-client \ expat-devel \ flex \ isomd5sum \ -- 2.16.6