Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes build issue with CentOS7 and modified gitmodules to use https like parent repo for consistency #914

Closed
wants to merge 3 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion executable.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-* && \
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
Expand Down Expand Up @@ -146,7 +149,10 @@ 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
RUN yum install -y epel-release && \
# Workaround for CentOS7 EOL
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

Expand Down Expand Up @@ -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-* && \
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 .
Expand Down
Loading