Skip to content
Snippets Groups Projects
Commit d72d10a1 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Updated container, acts@1.00.0, add ghostscript/gv

parent 4b527332
Branches
Tags
1 merge request!10New v2.2.0 release version
# Builder with Argonne EIC software # 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>" \ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
name="eic_builder" \ name="eic_builder" \
...@@ -11,17 +11,26 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \ ...@@ -11,17 +11,26 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
ENV DOCKERFILE_BASE=debian \ ENV DOCKERFILE_BASE=debian \
DOCKERFILE_DISTRO=debian \ DOCKERFILE_DISTRO=debian \
DOCKERFILE_DISTRO_VERSION=20200803-testing \ DOCKERFILE_DISTRO_VERSION=20200908-testing \
SPACK_ROOT=/opt/spack \ SPACK_ROOT=/opt/spack \
DEBIAN_FRONTEND=noninteractive \ DEBIAN_FRONTEND=noninteractive \
CURRENTLY_BUILDING_DOCKER_IMAGE=1 \ CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
container=docker 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 ## Ensure an up-to-date custom package list
RUN rm -rf $SPACK_ROOT/np-spack \ RUN rm -rf $SPACK_ROOT/np-spack \
&& git clone https://eicweb.phy.anl.gov/EIC/np-spack.git $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 - \ && cd $SPACK_ROOT/np-spack \
&& rm -rf $SPACK_ROOT/np-spack/.git \ && 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 "repos:" > $SPACK_ROOT/etc/spack/repos.yaml \
&& echo " - $SPACK_ROOT/np-spack" >> $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 ...@@ -32,7 +41,7 @@ COPY spack.yaml /opt/spack-environment/spack.yaml
## as this is a raw builder image ## as this is a raw builder image
RUN cd /opt/spack-environment \ RUN cd /opt/spack-environment \
&& spack env activate . \ && spack env activate . \
&& spack install -j32 \ && spack install -j64 \
&& spack clean -a && spack clean -a
## Install additional python packages ## Install additional python packages
......
...@@ -19,7 +19,7 @@ spack: ...@@ -19,7 +19,7 @@ spack:
- podio@master - podio@master
- geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl - geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl
- dd4hep@1.13.1 +geant4 +assimp +hepmc3 - 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 - gaudi@34.0
concretization: together concretization: together
config: config:
......
...@@ -31,6 +31,8 @@ ENV DOCKERFILE_DISTRO=ubuntu \ ...@@ -31,6 +31,8 @@ ENV DOCKERFILE_DISTRO=ubuntu \
RUN apt-get -yqq update \ RUN apt-get -yqq update \
&& apt-get -yqq install --no-install-recommends \ && apt-get -yqq install --no-install-recommends \
openssh-client \ openssh-client \
ghostscript \
gv \
&& locale-gen en_US.UTF-8 \ && locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment