This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 5132f28 GEODE-9212: Fix docker build (#795)
5132f28 is described below
commit 5132f283ec668805e7bb8c1b7cff5c5c8961e753
Author: Mario Salazar de Torres <[email protected]>
AuthorDate: Thu Apr 29 22:17:21 2021 +0200
GEODE-9212: Fix docker build (#795)
- Due to some changes in base images and in the CMake artifact names,
docker build is not working for the following images:
* rhel-8
* centos-8
* clang-tools
- This commit solves all build issues.
---
ci/docker/clang-tools/Dockerfile | 2 +-
docker/centos-8/Dockerfile | 2 +-
docker/rhel-8/Dockerfile | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ci/docker/clang-tools/Dockerfile b/ci/docker/clang-tools/Dockerfile
index f47c7e8..6bb98d5 100644
--- a/ci/docker/clang-tools/Dockerfile
+++ b/ci/docker/clang-tools/Dockerfile
@@ -48,6 +48,6 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*
RUN installer=$(mktemp) \
- && curl -o ${installer} -L $(curl -s
https://api.github.com/repos/Kitware/CMake/releases/latest | jq -r
'.assets[].browser_download_url | select(test("Linux-x86_64.sh"))') \
+ && curl -o ${installer} -L $(curl -s
https://api.github.com/repos/Kitware/CMake/releases/latest | jq -r
'.assets[].browser_download_url | select(test("linux-x86_64.sh"))') \
&& bash ${installer} --skip-license --prefix=/usr/local \
&& rm ${installer}
diff --git a/docker/centos-8/Dockerfile b/docker/centos-8/Dockerfile
index 4baef01..22430b6 100644
--- a/docker/centos-8/Dockerfile
+++ b/docker/centos-8/Dockerfile
@@ -26,7 +26,7 @@ RUN yum update -y && \
COPY bellsoft.repo /etc/yum.repos.d/
RUN yum install -y 'dnf-command(config-manager)' && \
- yum config-manager --set-enabled PowerTools && \
+ yum config-manager --set-enabled powertools && \
yum update -y && \
yum install -y --setopt=tsflags=nodocs \
git \
diff --git a/docker/rhel-8/Dockerfile b/docker/rhel-8/Dockerfile
index f17959d..25b87b3 100644
--- a/docker/rhel-8/Dockerfile
+++ b/docker/rhel-8/Dockerfile
@@ -24,10 +24,10 @@ RUN yum update -y && \
yum -y clean all
COPY bellsoft.repo /etc/yum.repos.d/
-COPY --from=centos:8 /etc/yum.repos.d/CentOS-PowerTools.repo /etc/yum.repos.d/
+COPY --from=centos:8 /etc/yum.repos.d/CentOS-Linux-PowerTools.repo
/etc/yum.repos.d/
COPY --from=centos:8 /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
/etc/pki/rpm-gpg/
-RUN yum config-manager --set-enabled PowerTools && \
+RUN yum config-manager --set-enabled powertools && \
yum update -y && \
yum install -y --setopt=tsflags=nodocs \
git \
