Skip to content
This repository was archived by the owner on Mar 3, 2023. It is now read-only.

Fix conflict Rocky8 #3787

Merged
merged 1 commit into from
Mar 6, 2022
Merged

Fix conflict Rocky8 #3787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions docker/dist/Dockerfile.dist.rocky8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 7 additions & 12 deletions docker/test/Dockerfile.rocky8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down