diff --git a/docker/compile/Dockerfile.centos7 b/docker/compile/Dockerfile.centos7 index bca5155c449..cd965523274 100644 --- a/docker/compile/Dockerfile.centos7 +++ b/docker/compile/Dockerfile.centos7 @@ -19,10 +19,6 @@ FROM centos:centos7 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM linux -<<<<<<< HEAD -ENV LC_ALL en_US.utf8 -======= ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts) RUN yum -y upgrade && yum -y install centos-release-scl-rh RUN yum -y install \ @@ -35,10 +31,7 @@ RUN yum -y install \ devtoolset-8-gcc \ devtoolset-8-gcc-c++ \ git \ -<<<<<<< HEAD -======= glibc-langpack-en \ ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts) kernel-devel \ libtool \ make \ @@ -53,10 +46,7 @@ RUN yum -y install \ java-11-openjdk \ java-11-openjdk-devel -<<<<<<< HEAD -======= ENV LC_ALL en_US.utf8 ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts) ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk ENV bazelVersion 4.2.2 @@ -79,8 +69,4 @@ RUN /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python3 \ && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/cpp /usr/bin/cpp ADD bazelrc /root/.bazelrc -<<<<<<< HEAD -ADD scripts/compile-platform.sh /compile-platform.sh -======= ADD scripts/compile-platform.sh /compile-platform.sh ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts) diff --git a/docker/dist/Dockerfile.dist.centos7 b/docker/dist/Dockerfile.dist.centos7 index 56ed42442fb..06d667714da 100644 --- a/docker/dist/Dockerfile.dist.centos7 +++ b/docker/dist/Dockerfile.dist.centos7 @@ -16,20 +16,10 @@ # under the License. #syntax=docker/dockerfile:1.2 -<<<<<<< HEAD -<<<<<<< HEAD:docker/dist/Dockerfile.dist.centos7 -FROM centos:centos7 -======= FROM rockylinux:8.5 ->>>>>>> 9ce047445ac (Change centos to RockyLinux-8):docker/dist/Dockerfile.dist.centos8 ENV TARGET_PLATFORM linux ENV LC_ALL en_US.utf8 -======= -FROM centos:centos7 - -ENV TARGET_PLATFORM linux ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts) RUN yum -y upgrade && yum -y install centos-release-scl-rh RUN yum -y install epel-release \ @@ -42,15 +32,8 @@ RUN yum -y install epel-release \ rh-python38-python-devel \ unzip \ which \ -<<<<<<< HEAD - && yum clean all - -======= - glibc-langpack-en \ && yum clean all -ENV LC_ALL en_US.utf8 ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts) ENV JAVA_HOME /usr/ RUN /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python \ @@ -82,8 +65,4 @@ ARG ZK_DIST=zookeeper-3.5.8 RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST ADD dist/conf/zookeeper.conf /opt/zookeeper/conf/zookeeper.conf -<<<<<<< HEAD -ADD dist/conf/sandbox.conf /etc/supervisor/conf.d/ -======= ADD dist/conf/sandbox.conf /etc/supervisor/conf.d/ ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts) diff --git a/docker/dist/Dockerfile.dist.rocky8 b/docker/dist/Dockerfile.dist.rocky8 index 5b3738577f3..9822fcf5a34 100644 --- a/docker/dist/Dockerfile.dist.rocky8 +++ b/docker/dist/Dockerfile.dist.rocky8 @@ -16,19 +16,8 @@ # under the License. #syntax=docker/dockerfile:1.2 -<<<<<<< HEAD:docker/dist/Dockerfile.dist.centos7 -FROM centos:centos7 -======= FROM rockylinux:8.5 ->>>>>>> 9ce047445ac (Change centos to RockyLinux-8):docker/dist/Dockerfile.dist.centos8 -<<<<<<< HEAD -ENV TARGET_PLATFORM linux -ENV LC_ALL en_US.utf8 - -RUN yum -y upgrade && yum -y install centos-release-scl-rh -======= ->>>>>>> 5e9468763f0 (Add glibc-langpack-en for LC_ALL) RUN yum -y install epel-release \ && yum -y install \ curl \ diff --git a/docker/test/Dockerfile.centos7 b/docker/test/Dockerfile.centos7 index 8c65ba7f33b..5a0231c0546 100644 --- a/docker/test/Dockerfile.centos7 +++ b/docker/test/Dockerfile.centos7 @@ -15,32 +15,13 @@ # specific language governing permissions and limitations # under the License. -<<<<<<< HEAD -<<<<<<< HEAD:docker/test/Dockerfile.centos7 -FROM centos:centos7 -======= FROM rockylinux:8.5 ->>>>>>> 9ce047445ac (Change centos to RockyLinux-8):docker/test/Dockerfile.centos8 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM linux ENV LC_ALL en_US.utf8 -<<<<<<<< HEAD:docker/test/Dockerfile.centos7 RUN yum -y upgrade && yum -y install centos-release-scl-rh -======== -ENV LC_ALL en_US.utf8 - -RUN yum -y upgrade ->>>>>>>> b1eb04dfd33 (Documentation cleanup):docker/test/Dockerfile.rocky8 -======= -FROM centos:centos7 - -# This is passed to the heron build command via the --config flag -ENV TARGET_PLATFORM linux - -RUN yum -y upgrade && yum -y install centos-release-scl-rh ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts) RUN yum -y install \ automake \ curl \ @@ -61,12 +42,7 @@ RUN yum -y install \ wget \ which \ tree \ -<<<<<<< HEAD java-11-openjdk-devel -======= - java-11-openjdk-devel \ - glibc-langpack-en ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts) 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 \ @@ -75,10 +51,6 @@ RUN /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python3 \ && /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 -<<<<<<< HEAD -======= -ENV LC_ALL en_US.utf8 ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts) ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk ENV bazelVersion 4.2.2 @@ -88,8 +60,4 @@ RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/ && /tmp/bazel.sh ADD bazelrc /root/.bazelrc -<<<<<<< HEAD -ADD scripts/test-platform.sh /test-platform.sh -======= ADD scripts/test-platform.sh /test-platform.sh ->>>>>>> 65e3725aa60 (Adding in centos7 to resolve conflicts)