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,38 @@ FROM hepstore/rivet:3.0.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.3.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 dnf install -y mercurial libtool + RUN mkdir /code && cd /code \ && wget https://www.hepforge.org/archive/thepeg/ThePEG-2.1.5.tar.bz2 -O- | tar xj \ - && cd ThePEG-*/ && ./configure --enable-shared --{prefix,with-{fastjet,hepmc,lhapdf,rivet}}=/usr/local \ + && cd ThePEG-*/ && ./configure --enable-shared --{prefix,with-{fastjet,hepmc,lhapdf}}=/usr/local \ && make -j5 && make install \ && cd ../.. && rm -rf /code +#&& hg clone https://phab.hepforge.org/source/thepeghg ThePEG-hg -b release-2-1 -r 15cd9c8ceac1 \ +#&& (cd ThePEG-*/ && hg up 15cd9c8ceac1 && autoreconf -i) \ +#&& cd ThePEG-*/ && ./configure --enable-shared --{prefix,with-{fastjet,hepmc,lhapdf,rivet}}=/usr/local \ + + RUN mkdir /code && cd /code \ && wget https://www.hepforge.org/archive/herwig/Herwig-7.1.5.tar.bz2 -O- | tar xj \ && cd Herwig-*/ \ && ./configure --{prefix,with-{thepeg,fastjet}}=/usr/local \ && make -j5 && make install \ && cd ../.. && rm -rf /code WORKDIR /work