From eaf51466129930f54732702a5a7b487f5cf9e110 Mon Sep 17 00:00:00 2001 From: Harshad Sane Date: Tue, 30 Jul 2024 18:22:26 +0000 Subject: [PATCH 1/3] Changed gitmodules to use https for consistency, fixed build to manage CentOS7 EOL --- .gitmodules | 2 +- executable.Dockerfile | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9b53eef8f..73f8a2b7b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "granulate-utils"] path = granulate-utils - url = git@github.com:Granulate/granulate-utils.git + url = https://github.com/Granulate/granulate-utils.git diff --git a/executable.Dockerfile b/executable.Dockerfile index 7d539631d..25b8d2469 100644 --- a/executable.Dockerfile +++ b/executable.Dockerfile @@ -74,6 +74,9 @@ RUN ./phpspy_build.sh # async-profiler glibc FROM centos${AP_BUILDER_CENTOS} AS async-profiler-builder-glibc WORKDIR /tmp +# Workaround for CentOS7 EOL +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-* COPY scripts/async_profiler_env_glibc.sh . RUN ./async_profiler_env_glibc.sh @@ -146,6 +149,9 @@ RUN if grep -q "CentOS Linux 8" /etc/os-release ; then \ fi # update libmodulemd to fix https://bugzilla.redhat.com/show_bug.cgi?id=2004853 +# Workaround for CentOS7 EOL +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 yum install -y epel-release && \ yum install -y libmodulemd && \ yum clean all @@ -200,6 +206,10 @@ RUN python3 -m pip install --no-cache-dir --upgrade pip FROM ${NODE_PACKAGE_BUILDER_GLIBC} as node-package-builder-glibc USER 0 WORKDIR /tmp +# Workaround for CentOS7 EOL +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-* + COPY scripts/node_builder_glibc_env.sh . RUN ./node_builder_glibc_env.sh COPY scripts/build_node_package.sh . From 91a8ac02d92222db4b12dc0ae66b4611e269e2fa Mon Sep 17 00:00:00 2001 From: Ariel Moshe Date: Mon, 19 Aug 2024 08:21:10 -0700 Subject: [PATCH 2/3] Update .gitmodules Revert granulate-utils change --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 73f8a2b7b..9b53eef8f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "granulate-utils"] path = granulate-utils - url = https://github.com/Granulate/granulate-utils.git + url = git@github.com:Granulate/granulate-utils.git From 17dcc156dc7d0fe39f168753ab9338bf68aa99a5 Mon Sep 17 00:00:00 2001 From: Ariel Moshe Date: Mon, 19 Aug 2024 08:24:29 -0700 Subject: [PATCH 3/3] Update executable.Dockerfile --- executable.Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/executable.Dockerfile b/executable.Dockerfile index 25b8d2469..1f9570f2c 100644 --- a/executable.Dockerfile +++ b/executable.Dockerfile @@ -75,8 +75,8 @@ RUN ./phpspy_build.sh FROM centos${AP_BUILDER_CENTOS} AS async-profiler-builder-glibc WORKDIR /tmp # Workaround for CentOS7 EOL -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-* && \ + sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* COPY scripts/async_profiler_env_glibc.sh . RUN ./async_profiler_env_glibc.sh @@ -150,9 +150,9 @@ RUN if grep -q "CentOS Linux 8" /etc/os-release ; then \ # update libmodulemd to fix https://bugzilla.redhat.com/show_bug.cgi?id=2004853 # Workaround for CentOS7 EOL -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 yum install -y epel-release && \ +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \ + sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && \ + yum install -y epel-release && \ yum install -y libmodulemd && \ yum clean all @@ -207,8 +207,8 @@ FROM ${NODE_PACKAGE_BUILDER_GLIBC} as node-package-builder-glibc USER 0 WORKDIR /tmp # Workaround for CentOS7 EOL -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-* && \ + sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* COPY scripts/node_builder_glibc_env.sh . RUN ./node_builder_glibc_env.sh