fixed rpm build for all distros
This commit is contained in:
@@ -296,15 +296,15 @@ EOF
|
||||
LSB_RELEASE=/usr/bin/lsb_release
|
||||
fi
|
||||
docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget $LSB_RELEASE
|
||||
i=0
|
||||
for key in "${keys[@]}"; do
|
||||
wget -Orpm-key "$key"
|
||||
docker exec -i ${DOCKER_ID} rpm --import rpm-key
|
||||
rm rpm-key
|
||||
done
|
||||
if docker exec ${DOCKER_ID} test -x /usr/bin/dnf; then
|
||||
docker exec ${DOCKER_ID} dnf install -y 'dnf-command(config-manager)'
|
||||
fi
|
||||
i=0
|
||||
for key in "${keys[@]}"; do
|
||||
docker exec -i ${DOCKER_ID} wget -Orpm-key "$key"
|
||||
docker exec -i ${DOCKER_ID} rpm --import rpm-key
|
||||
docker exec -i ${DOCKER_ID} rm rpm-key
|
||||
done
|
||||
for repo in "${repos[@]}"; do
|
||||
INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false))
|
||||
ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'"
|
||||
|
||||
Reference in New Issue
Block a user