diff --git a/docker/rivet-herwig/Dockerfile b/docker/rivet-herwig/Dockerfile --- a/docker/rivet-herwig/Dockerfile +++ b/docker/rivet-herwig/Dockerfile @@ -1,31 +1,31 @@ FROM hepstore/rivet:2.7.1 MAINTAINER Andy Buckley RUN dnf install -y boost-devel RUN mkdir /code && cd /code \ - && wget https://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.1.tar.gz -O- | tar xz \ + && wget https://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.2.tar.gz -O- | tar xz \ && cd LHAPDF-*/ && ./configure --prefix=/usr/local \ && make -j5 && make install \ && cd ../.. && rm -rf /code -#RUN lhapdf install MMHT2014{,n}lo68cl -RUN cd /usr/local/share/LHAPDF/ && \ - for pdf in MMHT2014{,n}lo68cl; do \ - wget https://lhapdf.hepforge.org/downloads?f=pdfsets/current/$pdf.tar.gz -O- | tar xz; \ - done +RUN lhapdf install MMHT2014{,n}lo68cl +# RUN cd /usr/local/share/LHAPDF/ && \ +# for pdf in MMHT2014{,n}lo68cl; do \ +# wget https://lhapdf.hepforge.org/downloads?f=pdfsets/current/$pdf.tar.gz -O- | tar xz; \ +# done RUN mkdir /code && cd /code \ && wget https://www.hepforge.org/archive/thepeg/ThePEG-2.1.4.tar.bz2 -O- | tar xj \ && cd ThePEG-*/ && ./configure --enable-shared --{prefix,with-{fastjet,hepmc,lhapdf,rivet}}=/usr/local \ && make -j5 && make install \ && cd ../.. && rm -rf /code RUN mkdir /code && cd /code \ && wget https://www.hepforge.org/archive/herwig/Herwig-7.1.4.tar.bz2 -O- | tar xj \ && cd Herwig-*/ \ && ./configure --{prefix,with-{thepeg,fastjet}}=/usr/local \ && make -j5 && make install \ && cd ../.. && rm -rf /code WORKDIR /work diff --git a/docker/rivet-pythia/Dockerfile b/docker/rivet-pythia/Dockerfile --- a/docker/rivet-pythia/Dockerfile +++ b/docker/rivet-pythia/Dockerfile @@ -1,25 +1,25 @@ FROM hepstore/rivet:2.7.1 MAINTAINER Andy Buckley RUN dnf install -y rsync RUN mkdir /code && cd /code \ - && wget https://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.1.tar.gz -O- | tar xz \ + && wget https://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.2.tar.gz -O- | tar xz \ && cd LHAPDF-*/ && ./configure --prefix=/usr/local \ && make -j5 && make install \ && cd ../.. && rm -r /code RUN mkdir /code && cd /code \ && wget http://home.thep.lu.se/~torbjorn/pythia8/pythia8240.tgz -O- | tar xz \ && cd pythia*/ && ./configure --enable-shared --{prefix,with-{hepmc2,lhapdf6}}=/usr/local \ && make -j5 && make install \ && cd ../.. && rm -r /code RUN mkdir /code && cd /code \ && wget https://agile.hepforge.org/downloads/?f=Sacrifice-1.1.2.tar.gz -O- | tar xz \ && cd Sacrifice-*/ \ && ./configure --{prefix,with-{pythia,hepmc,LHAPDF}}=/usr/local \ && make -j5 && make install \ && cd ../.. && rm -r /code WORKDIR /work