diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml index 441bf39223..b5cf372685 100644 --- a/build/ansible/roles/pmm2-images/tasks/main.yml +++ b/build/ansible/roles/pmm2-images/tasks/main.yml @@ -55,7 +55,7 @@ name: "*" state: latest exclude: "ansible*" - disablerepo: percona-release-x86_64 + disablerepo: pmm2-server - name: Packages | Update OS EL9 when: diff --git a/build/docker/server/Dockerfile b/build/docker/server/Dockerfile index d5c2a752f7..ca48e5d55e 100644 --- a/build/docker/server/Dockerfile +++ b/build/docker/server/Dockerfile @@ -13,7 +13,14 @@ EXPOSE 80 443 WORKDIR /opt -RUN yum -y install epel-release && yum -y install ansible +# Disable fastestmirror plugin and update repo URLs +RUN sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf && \ + sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo && \ + sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo + +# Install EPEL repository and Ansible +RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ + yum -y install ansible COPY RPMS /tmp/RPMS COPY gitCommit /tmp/gitCommit diff --git a/build/scripts/build-client-rpm b/build/scripts/build-client-rpm index 7c178670d0..938ba39ccb 100755 --- a/build/scripts/build-client-rpm +++ b/build/scripts/build-client-rpm @@ -14,6 +14,14 @@ main() { set -o errexit set -o xtrace + if grep -q 'CentOS Linux 7' /etc/os-release; then + # disable fastestmirror plugin, which mostly fails due to CentOS 7 being EOL + sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf + + sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo + sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo + fi + export pmm_version=$pmm_version export pmm_release=$pmm_release export sudo_path=\$(ls /usr/bin/sudo) diff --git a/build/scripts/build-client-srpm b/build/scripts/build-client-srpm index aff1082492..2664613c66 100755 --- a/build/scripts/build-client-srpm +++ b/build/scripts/build-client-srpm @@ -14,6 +14,14 @@ main() { set -o errexit set -o xtrace + if grep -q 'CentOS Linux 7' /etc/os-release; then + # disable fastestmirror plugin, which mostly fails due to CentOS 7 being EOL + sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf + + sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo + sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo + fi + export pmm_release=$pmm_release export sudo_path= if [ -e /usr/bin/sudo ]; then diff --git a/build/scripts/build-server-rpm b/build/scripts/build-server-rpm index 4c2cb97df6..8fdaa28d32 100755 --- a/build/scripts/build-server-rpm +++ b/build/scripts/build-server-rpm @@ -109,6 +109,14 @@ build() { echo \"repo_name: ${repo_name}\" echo \"rpm_verison: ${rpm_version}\" + if grep -q 'CentOS Linux 7' /etc/os-release; then + # disable fastestmirror plugin, which mostly fails due to CentOS 7 being EOL + sudo sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf + + sudo sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo + sudo sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo + fi + sudo chown -R builder:builder /home/builder/rpm/RPMS /home/builder/rpm/SOURCES # Add 'Epoch' to spec file to prevent update of rpms which are built in PR build