diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile index 9388a43ee2e47d0054ef8bb919d18ddf8dc54f97..697eaf47fbb4df7fdbf7a9e5ab9a553e805575a6 100644 --- a/containers/builder/Dockerfile +++ b/containers/builder/Dockerfile @@ -1,6 +1,6 @@ # Builder with Argonne EIC software # -FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:0.15.4 +FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:snapshot-20200922 LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \ name="eic_builder" \ @@ -11,17 +11,26 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \ ENV DOCKERFILE_BASE=debian \ DOCKERFILE_DISTRO=debian \ - DOCKERFILE_DISTRO_VERSION=20200803-testing \ + DOCKERFILE_DISTRO_VERSION=20200908-testing \ SPACK_ROOT=/opt/spack \ DEBIAN_FRONTEND=noninteractive \ CURRENTLY_BUILDING_DOCKER_IMAGE=1 \ container=docker +## install ghostview/ghostscript needed by some of the tools +RUN apt-get -yqq update \ + && apt-get -yqq install --no-install-recommends \ + ghostscript \ + gv \ + && rm -rf /var/lib/apt/lists/* + ## Ensure an up-to-date custom package list RUN rm -rf $SPACK_ROOT/np-spack \ && git clone https://eicweb.phy.anl.gov/EIC/np-spack.git $SPACK_ROOT/np-spack \ - && cd $SPACK_ROOT/np-spack && git checkout v`spack --version` && cd - \ - && rm -rf $SPACK_ROOT/np-spack/.git \ + && cd $SPACK_ROOT/np-spack \ + && git checkout snapshot-`echo $(spack --version) | cut -d- -f3` \ + && cd - \ + && echo "DISABLED: rm -rf $SPACK_ROOT/np-spack/.git" \ && echo "repos:" > $SPACK_ROOT/etc/spack/repos.yaml \ && echo " - $SPACK_ROOT/np-spack" >> $SPACK_ROOT/etc/spack/repos.yaml @@ -32,7 +41,7 @@ COPY spack.yaml /opt/spack-environment/spack.yaml ## as this is a raw builder image RUN cd /opt/spack-environment \ && spack env activate . \ - && spack install -j32 \ + && spack install -j64 \ && spack clean -a ## Install additional python packages diff --git a/containers/builder/spack.yaml b/containers/builder/spack.yaml index f520c32020ad5b5c6b26293aff622e5e1100c727..41466c2853df6fc7a778043951d21bc4974e6efb 100644 --- a/containers/builder/spack.yaml +++ b/containers/builder/spack.yaml @@ -19,7 +19,7 @@ spack: - podio@master - geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl - dd4hep@1.13.1 +geant4 +assimp +hepmc3 - - acts@0.31.0 +dd4hep +digitization +identification +json +tgeo + - acts@1.00.0 +dd4hep +digitization +identification +json +tgeo - gaudi@34.0 concretization: together config: diff --git a/containers/release/Dockerfile.in b/containers/release/Dockerfile.in index 0cfa63cfcb8b9d0d2ca456aea2e5d3c53b21d23d..77bf2c65622c4975c57f0e64870e79f8ee916e51 100644 --- a/containers/release/Dockerfile.in +++ b/containers/release/Dockerfile.in @@ -31,6 +31,8 @@ ENV DOCKERFILE_DISTRO=ubuntu \ RUN apt-get -yqq update \ && apt-get -yqq install --no-install-recommends \ openssh-client \ + ghostscript \ + gv \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/*