You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ni...@apache.org on 2022/03/06 14:01:38 UTC
[incubator-heron] branch master updated: Fix conflict in Rocky 8 Dockerfile (#3787)
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 4f27c18 Fix conflict in Rocky 8 Dockerfile (#3787)
4f27c18 is described below
commit 4f27c18e4d8c6832030e12cca0edf9f23dc64b5b
Author: choi se <35...@users.noreply.github.com>
AuthorDate: Sun Mar 6 23:01:30 2022 +0900
Fix conflict in Rocky 8 Dockerfile (#3787)
---
docker/dist/Dockerfile.dist.rocky8 | 10 ++++------
docker/test/Dockerfile.rocky8 | 19 +++++++------------
2 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/docker/dist/Dockerfile.dist.rocky8 b/docker/dist/Dockerfile.dist.rocky8
index 9822fcf..3b87b63 100644
--- a/docker/dist/Dockerfile.dist.rocky8
+++ b/docker/dist/Dockerfile.dist.rocky8
@@ -24,20 +24,18 @@ RUN yum -y install epel-release \
java-11-openjdk-headless \
supervisor \
nmap-ncat \
- rh-python38-python \
- rh-python38-python-devel \
+ python39 \
+ python39-devel \
unzip \
which \
glibc-langpack-en \
&& yum clean all
+RUN update-alternatives --set python /usr/bin/python3.9
+
ENV LC_ALL en_US.utf8
ENV JAVA_HOME /usr/
-RUN /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python \
- && /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python3 \
- && /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3.8 /usr/bin/python3.8
-
# run Heron installer
RUN --mount=type=bind,source=artifacts,target=/tmp/heron /tmp/heron/heron-install.sh \
&& rm -f /usr/local/heron/dist/heron-core.tar.gz
diff --git a/docker/test/Dockerfile.rocky8 b/docker/test/Dockerfile.rocky8
index e6e43e0..cc7386d 100644
--- a/docker/test/Dockerfile.rocky8
+++ b/docker/test/Dockerfile.rocky8
@@ -19,7 +19,6 @@ FROM rockylinux:8.5
# This is passed to the heron build command via the --config flag
ENV TARGET_PLATFORM linux
-ENV LC_ALL en_US.utf8
RUN yum -y upgrade
RUN yum -y install \
@@ -28,29 +27,25 @@ RUN yum -y install \
cmake \
openssl-devel \
file \
- devtoolset-8-gcc \
- devtoolset-8-gcc-c++ \
+ gcc \
+ gcc-c++ \
git \
+ glibc-langpack-en \
kernel-devel \
libtool \
make \
patch \
ant \
- rh-python38-python-devel \
+ python39 \
+ python39-devel \
zip \
unzip \
wget \
which \
tree \
- java-11-openjdk-devel \
- glibc-langpack-en
+ java-11-openjdk-devel
-RUN /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python3 \
- && /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python \
- && /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3.8 /usr/bin/python3.8 \
- && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/gcc /usr/bin/gcc \
- && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/g++ /usr/bin/g++ \
- && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/cpp /usr/bin/cpp
+RUN update-alternatives --set python /usr/bin/python3.9
ENV LC_ALL en_US.utf8
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk