Unverified Commit 96ad7bad authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon Committed by GitHub
Browse files

Merge pull request #1077 from chuckatkins/update-compilers 

Update compilers
parents 4d83f1bb be623d20

scripts/circle/el7-intel18-ohpc/Dockerfile

+3 −3
Original line number Diff line number Diff line 
FROM centos:centos7



# Install core dev packages

RUN yum -y install make curl file git valgrind vim \

RUN yum -y install make curl file git gcc gcc-g++ valgrind vim \

        gdb zlib zlib-devel bzip2 bzip2-libs bzip2-devel python-devel

RUN yum -y install epel-release

RUN yum -y install zeromq-devel
@@ -9,8 +9,8 @@ RUN yum -y install zeromq-devel 
# Install Intel C++ compiler

WORKDIR /tmp

COPY silent-custom.cfg /tmp

RUN curl -L http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12717/parallel_studio_xe_2018_update2_cluster_edition.tgz | tar -xz \

  && ./parallel_studio_xe_2018_update2_cluster_edition/install.sh -s ./silent-custom.cfg \

RUN curl -L 'https://data.kitware.com/api/v1/file/5c1a96318d777f072bdbff4b/download' | tar -xz \

  && ./parallel_studio_xe_2018_update4_cluster_edition/install.sh -s ./silent-custom.cfg \

  && rm -rf parallel_studio_xe_2018* silent*



# Install extra repos

scripts/circle/el7-intel18-openmpi-ohpc/Dockerfile

+3 −3
Original line number Diff line number Diff line 
FROM centos:centos7



# Install core dev packages

RUN yum -y install make curl file git gcc pkg-config valgrind vim \

RUN yum -y install make curl file git gcc gcc-g++ pkg-config valgrind vim \

        gdb zlib zlib-devel bzip2 bzip2-libs bzip2-devel python-devel

RUN yum -y install epel-release

RUN yum -y install zeromq-devel
@@ -9,8 +9,8 @@ RUN yum -y install zeromq-devel 
# Install Intel C++ compiler

WORKDIR /tmp

COPY silent-custom.cfg /tmp

RUN curl -L http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12717/parallel_studio_xe_2018_update2_cluster_edition.tgz | tar -xz \

  && ./parallel_studio_xe_2018_update2_cluster_edition/install.sh -s ./silent-custom.cfg \

RUN curl -L 'https://data.kitware.com/api/v1/file/5c1a96318d777f072bdbff4b/download' | tar -xz \

  && ./parallel_studio_xe_2018_update4_cluster_edition/install.sh -s ./silent-custom.cfg \

  && rm -rf parallel_studio_xe_2018* silent*



# Install extra repos

scripts/circle/suse-pgi-openmpi/Dockerfile

+6 −6
Original line number Diff line number Diff line
@@ -19,17 +19,17 @@ RUN curl -L https://github.com/ofiwg/libfabric/releases/download/v1.6.0/libfabri 
  && rm -rf libfabric-1.6.0



# Install the CMake binary

WORKDIR /opt/cmake/3.11.2

RUN curl -L https://cmake.org/files/v3.11/cmake-3.11.2-Linux-x86_64.tar.gz | \

WORKDIR /opt/cmake/3.13.1

RUN curl -L https://cmake.org/files/v3.13/cmake-3.13.1-Linux-x86_64.tar.gz | \

     tar --strip-components=1 -xz \

  && pushd /usr/local/bin \

  && ln -s /opt/cmake/3.11.2/bin/ctest \

  && ln -s /opt/cmake/3.11.2/bin/cmake \

  && ln -s /opt/cmake/3.11.2/bin/cpack

  && ln -s /opt/cmake/3.13.1/bin/ctest \

  && ln -s /opt/cmake/3.13.1/bin/cmake \

  && ln -s /opt/cmake/3.13.1/bin/cpack



# Install PGI compiler

WORKDIR /tmp/pgi-install

RUN curl -L 'https://data.kitware.com/api/v1/file/5aff14c18d777f15ebe1ec22/download' | tar -xz

RUN curl -L 'https://data.kitware.com/api/v1/file/5c1a8caa8d777f072bdbfafb/download' | tar -xz

RUN export \

      PGI_SILENT=true \

      PGI_ACCEPT_EULA=accept \

scripts/circle/suse-pgi/Dockerfile

+6 −6
Original line number Diff line number Diff line
@@ -11,17 +11,17 @@ WORKDIR /usr/bin 
RUN ln -s gfortran g77



# Install the CMake binary

WORKDIR /opt/cmake/3.11.2

RUN curl -L https://cmake.org/files/v3.11/cmake-3.11.2-Linux-x86_64.tar.gz | \

WORKDIR /opt/cmake/3.13.1

RUN curl -L https://cmake.org/files/v3.13/cmake-3.13.1-Linux-x86_64.tar.gz | \

     tar --strip-components=1 -xz \

  && pushd /usr/local/bin \

  && ln -s /opt/cmake/3.11.2/bin/ctest \

  && ln -s /opt/cmake/3.11.2/bin/cmake \

  && ln -s /opt/cmake/3.11.2/bin/cpack

  && ln -s /opt/cmake/3.13.1/bin/ctest \

  && ln -s /opt/cmake/3.13.1/bin/cmake \

  && ln -s /opt/cmake/3.13.1/bin/cpack



# Install PGI compiler

WORKDIR /tmp/pgi-install

RUN curl -L 'https://data.kitware.com/api/v1/file/5aff14c18d777f15ebe1ec22/download' | tar -xz

RUN curl -L 'https://data.kitware.com/api/v1/file/5c1a8caa8d777f072bdbfafb/download' | tar -xz

RUN export \

      PGI_SILENT=true \

      PGI_ACCEPT_EULA=accept \