On Thu, Mar 18, 2021 at 09:26:04AM +0800, Lin Jiaxin wrote:
On Thu, Mar 18, 2021 at 09:09:04AM +0800, Liu Shaofei wrote:
^[[91m+ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 ^[[0m^[[91merror: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7: import read failed(2). ^[[0m
Signed-off-by: Liu Shaofei 370072077@qq.com
tests/openeuler_docker | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/tests/openeuler_docker b/tests/openeuler_docker index b0b5336a3..139b5eb56 100755 --- a/tests/openeuler_docker +++ b/tests/openeuler_docker @@ -78,6 +78,13 @@ handle_epelrpm() } }
+handle_rpm_gpg() +{
- grep -qw "RPM-GPG-KEY-CentOS-7" "$dockerfile_name" && {
sed -i "s|RPM-GPG-KEY-CentOS-7|PM-GPG-KEY-openEuler|g" "$dockerfile_name"- }
sed -i "s|RPM-GPG-KEY-CentOS-7|PM-GPG-KEY-openEuler|g" "$dockerfile_name" is enough
OK, right Thanks, Liushaofei
Thanks, Jiaxin
+}
add_base_commands() { # grep -qw "groupadd*" "$file" && { @@ -95,6 +102,7 @@ handle_dockerfile() is_openeuler_build_fail=1 handle_FROM handle_epel
- handle_rpm_gpg add_base_commands if docker_build "-openeuler"; then docker_run "-openeuler"
-- 2.23.0