From 4ee5b51fc93cb28b9fd474fb70a53473329a5f0c Mon Sep 17 00:00:00 2001 From: Morteza E <105240903+mershad-manesh@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:29:41 -0400 Subject: [PATCH 1/4] simple change to trigger the build --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 45606cab17f0..929ae3529686 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -178,7 +178,7 @@ commands: #- add_ssh_keys: # fingerprints: # - "6a:c7:42:e6:e3:26:76:95:f4:0a:7a:5b:9c:b3:19:0e" - # #- "5e:70:a4:1a:f3:9f:39:ca:2a:d9:b5:9a:6c:2b:c3:66" + # #- "5e:70:a4:1a:f3:9f:39:ca:2a:d9:b5:9a:6c:2b:c3:66" - cached-checkout - run: name: Create git identity From 0230bcab86dbb368611224af38152e985a580db0 Mon Sep 17 00:00:00 2001 From: Morteza E <105240903+mershad-manesh@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:47:22 -0400 Subject: [PATCH 2/4] use vault instead of regular mirrors --- opennms-container/horizon/Dockerfile | 4 ++++ opennms-container/sentinel/Dockerfile | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/opennms-container/horizon/Dockerfile b/opennms-container/horizon/Dockerfile index 20bfacac06ee..a23612eefcf5 100644 --- a/opennms-container/horizon/Dockerfile +++ b/opennms-container/horizon/Dockerfile @@ -25,6 +25,10 @@ SHELL ["/bin/bash", "-c"] RUN curl --retry 5 --fail -L ${CONFD_URL} -o /usr/bin/confd && \ chmod +x /usr/bin/confd +# Given that CentOS mirrors are offline we will point to Vault +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* +RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* + RUN dnf -y install dnf-plugins-core && \ dnf config-manager --set-enabled powertools && \ rpm --import "${REPO_KEY_URL}" && \ diff --git a/opennms-container/sentinel/Dockerfile b/opennms-container/sentinel/Dockerfile index b13282e8b889..a4390d7cf018 100644 --- a/opennms-container/sentinel/Dockerfile +++ b/opennms-container/sentinel/Dockerfile @@ -17,6 +17,10 @@ ARG REPO_RPM="https://yum.opennms.org/repofiles/opennms-repo-stable-rhel8.noarch SHELL ["/bin/bash", "-c"] +# Given that CentOS mirrors are offline we will point to Vault +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* +RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* + # Collect generic steps in a layer for caching RUN rpm --import "${REPO_KEY_URL}" && \ dnf -y install epel-release && \ From 02318dade69df57737d3c4ccc3944dc710a110dd Mon Sep 17 00:00:00 2001 From: Morteza E <105240903+mershad-manesh@users.noreply.github.com> Date: Tue, 13 Aug 2024 12:10:32 -0400 Subject: [PATCH 3/4] disable vault server --- opennms-container/horizon/Dockerfile | 4 ++-- opennms-container/sentinel/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opennms-container/horizon/Dockerfile b/opennms-container/horizon/Dockerfile index 58ed08bf1d9e..10f818e38314 100644 --- a/opennms-container/horizon/Dockerfile +++ b/opennms-container/horizon/Dockerfile @@ -26,8 +26,8 @@ RUN curl --retry 5 --fail -L ${CONFD_URL} -o /usr/bin/confd && \ chmod +x /usr/bin/confd # Given that CentOS mirrors are offline we will point to Vault -RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* -RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* +#RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* +#RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* RUN dnf -y install dnf-plugins-core && \ dnf config-manager --set-enabled powertools && \ diff --git a/opennms-container/sentinel/Dockerfile b/opennms-container/sentinel/Dockerfile index 6ff93aaed461..55efa3439a23 100644 --- a/opennms-container/sentinel/Dockerfile +++ b/opennms-container/sentinel/Dockerfile @@ -18,8 +18,8 @@ ARG REPO_RPM="https://yum.opennms.org/repofiles/opennms-repo-stable-rhel8.noarch SHELL ["/bin/bash", "-c"] # Given that CentOS mirrors are offline we will point to Vault -RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* -RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* +#RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* +#RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* # Collect generic steps in a layer for caching RUN rpm --import "${REPO_KEY_URL}" && \ From 3244765ae2294f9a48b0c9fbd017a37722dcaa55 Mon Sep 17 00:00:00 2001 From: Morteza E <105240903+mershad-manesh@users.noreply.github.com> Date: Tue, 13 Aug 2024 13:41:15 -0400 Subject: [PATCH 4/4] Revert "disable vault server" This reverts commit 02318dade69df57737d3c4ccc3944dc710a110dd. --- opennms-container/horizon/Dockerfile | 4 ++-- opennms-container/sentinel/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opennms-container/horizon/Dockerfile b/opennms-container/horizon/Dockerfile index 10f818e38314..58ed08bf1d9e 100644 --- a/opennms-container/horizon/Dockerfile +++ b/opennms-container/horizon/Dockerfile @@ -26,8 +26,8 @@ RUN curl --retry 5 --fail -L ${CONFD_URL} -o /usr/bin/confd && \ chmod +x /usr/bin/confd # Given that CentOS mirrors are offline we will point to Vault -#RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* -#RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* +RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* RUN dnf -y install dnf-plugins-core && \ dnf config-manager --set-enabled powertools && \ diff --git a/opennms-container/sentinel/Dockerfile b/opennms-container/sentinel/Dockerfile index 55efa3439a23..6ff93aaed461 100644 --- a/opennms-container/sentinel/Dockerfile +++ b/opennms-container/sentinel/Dockerfile @@ -18,8 +18,8 @@ ARG REPO_RPM="https://yum.opennms.org/repofiles/opennms-repo-stable-rhel8.noarch SHELL ["/bin/bash", "-c"] # Given that CentOS mirrors are offline we will point to Vault -#RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* -#RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* +RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* # Collect generic steps in a layer for caching RUN rpm --import "${REPO_KEY_URL}" && \