Skip to content

Commit

Permalink
Merge pull request #133 from hariharan-devarajan/hariharan/docker_fix
Browse files Browse the repository at this point in the history
Hariharan/docker fix
  • Loading branch information
hariharan-devarajan committed Feb 19, 2021
2 parents 3a455d4 + 76ee9a5 commit 0f2f2ee
Show file tree
Hide file tree
Showing 5 changed files with 118 additions and 103 deletions.
102 changes: 0 additions & 102 deletions Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion adapter/test/stdio/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ set_target_properties(hermes_stdio_adapter_mpi_test PROPERTIES COMPILE_FLAGS "-D
mpi_daemon(hermes_stdio_adapter_mpi_test 2 "~[request_size=range-large]" "" 1)
mpi_daemon(hermes_stdio_adapter_mpi_test 2 "[request_size=range-large]" "large" 1)
if(HERMES_INSTALL_TESTS)
set(STDIO_TESTS stdio_adapter_mapper_test stdio_adapter_mapper_test stdio_adapter_test hermes_stdio_adapter_test stdio_adapter_mpi_test hermes_stdio_adapter_mpi_test)
set(STDIO_TESTS stdio_adapter_mapper_test stdio_adapter_test hermes_stdio_adapter_test stdio_adapter_mpi_test hermes_stdio_adapter_mpi_test)
foreach(program ${STDIO_TESTS})
install(
TARGETS
Expand Down
73 changes: 73 additions & 0 deletions deps.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
FROM ubuntu:18.04

ENV USER=hermes
RUN useradd -ms /bin/bash $USER
RUN su - $USER -c "touch me"

RUN apt-get update -q && \
apt-get install -yq gcc g++

RUN apt-get install -y sudo
RUN echo "${USER} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/$USER && \
chmod 0440 /etc/sudoers.d/$USER

RUN cat /etc/sudoers.d/$USER

RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
autoconf \
automake \
ca-certificates \
curl \
environment-modules \
git \
build-essential \
python \
vim \
sudo \
unzip \
cmake \
lcov \
zlib1g-dev \
libsdl2-dev \
gfortran

USER $USER

RUN sudo apt-get update -q

ENV HOME=/home/$USER

ENV PROJECT=$HOME/source
ENV INSTALL_DIR=$HOME/install
ENV SPACK_DIR=$HOME/spack
ENV SDS_DIR=$HOME/sds

RUN echo $INSTALL_DIR && mkdir -p $INSTALL_DIR

RUN git clone https://github.com/spack/spack ${SPACK_DIR}
RUN git clone https://xgitlab.cels.anl.gov/sds/sds-repo.git ${SDS_DIR}
RUN git clone https://github.com/HDFGroup/hermes ${PROJECT}


ENV spack=${SPACK_DIR}/bin/spack

RUN . ${SPACK_DIR}/share/spack/setup-env.sh

RUN $spack repo add ${SDS_DIR}
RUN $spack repo add $PROJECT/ci/hermes

RUN $spack compiler find

RUN $spack compiler list

ENV HERMES_VERSION=master

ENV HERMES_SPEC="hermes@${HERMES_VERSION}"
RUN $spack install --only dependencies ${HERMES_SPEC}

RUN echo "export PATH=${SPACK_DIR}/bin:$PATH" >> /home/$USER/.bashrc
RUN echo ". ${SPACK_DIR}/share/spack/setup-env.sh" >> /home/$USER/.bashrc

ENV PATH=${INSTALL_DIR}/bin:$PATH

WORKDIR $HOME
23 changes: 23 additions & 0 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM hdevarajan92/hermes-dep:latest

RUN sudo apt-get update -q

USER $USER

ENV HOME=/home/$USER

ENV INSTALL_DIR=$HOME/install

ENV PROJECT=$HOME/hermes

RUN $spack install --only package ${HERMES_SPEC}

RUN echo "spack load --only dependencies ${HERMES_SPEC}" >> /home/$USER/.bashrc
RUN echo "export CC=`which mpicc`" >> /home/$USER/.bashrc
RUN echo "export CXX=`which mpicxx`" >> /home/$USER/.bashrc

RUN git clone https://github.com/HDFGroup/hermes ${PROJECT}
RUN sh /home/$USER/.bashrc

RUN mkdir -p $PROJECT/build
WORKDIR $PROJECT/build
21 changes: 21 additions & 0 deletions user.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM hdevarajan92/hermes-dep:latest

RUN sudo apt-get update -q

USER $USER

ENV HOME=/home/$USER

ENV INSTALL_DIR=$HOME/install

ENV PROJECT=$HOME/hermes

RUN $spack install --only package ${HERMES_SPEC}

RUN echo "spack load ${HERMES_SPEC}" >> /home/$USER/.bashrc
RUN echo "export CC=`which mpicc`" >> /home/$USER/.bashrc
RUN echo "export CXX=`which mpicxx`" >> /home/$USER/.bashrc

RUN sh /home/$USER/.bashrc

WORKDIR $HOME

0 comments on commit 0f2f2ee

Please sign in to comment.