Skip to content
Snippets Groups Projects

Merge in new feature version

Merged Merge in new feature version
staging into master
Merged Sylvester Joosten requested to merge staging into master
Compare
and
7 files
+ 12
− 11
Compare changes
  • Side-by-side
  • Inline
Files
7
containers/builder/Dockerfile
+ 1
− 0
@@ -19,6 +19,7 @@ ENV DOCKERFILE_BASE=ubuntu \
@@ -19,6 +19,7 @@ ENV DOCKERFILE_BASE=ubuntu \
## 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 \
 
&& echo "Update spack for v2.1.3" \
&& 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 && git checkout v`spack --version` && cd - \
&& rm -rf $SPACK_ROOT/np-spack/.git \
&& rm -rf $SPACK_ROOT/np-spack/.git \