From 2573aee79ca2a83e337a1e72c4f19f9c5f9ff661 Mon Sep 17 00:00:00 2001
From: Robin Hofsaess <robin.hofsaess@kit.edu>
Date: Mon, 20 Nov 2023 12:22:27 +0000
Subject: [PATCH] Additional packages added to Herwig container

---
 tp_herwig/Dockerfile | 115 +++++++++----------------------------------
 1 file changed, 24 insertions(+), 91 deletions(-)

diff --git a/tp_herwig/Dockerfile b/tp_herwig/Dockerfile
index fca31f7..97ff31d 100644
--- a/tp_herwig/Dockerfile
+++ b/tp_herwig/Dockerfile
@@ -1,97 +1,30 @@
-FROM jeppelt/etp_tp:latest
+FROM gitlab.etp.kit.edu:5050/enjoy/course-container/herwig
 
 USER root
 
-RUN mkdir /herwig
-ENV INSTALL_LOC=/herwig
-
-# ### Install Boost
-# ENV BOOST_LOC=/herwig/boost
-# RUN mkdir $BOOST_LOC
-# WORKDIR $BOOST_LOC
-# RUN wget -O boost_1_62_0.tar.gz "http://sourceforge.net/projects/boost/files/boost/1.62.0/boost_1_62_0.tar.gz/download"
-# RUN tar -xvf boost_1_62_0.tar.gz
-# WORKDIR boost_1_62_0
-# RUN ./bootstrap.sh --prefix=$INSTALL_LOC --with-python=$(which python)
-# RUN ./b2 install --layout=tagged
-
-# ### Install RIVET
-# ENV INSTALL_PREFIX=$INSTALL_LOC 
-# ENV INSTALL_BOOST=0 
-# ENV BOOSTPATH=$INSTALL_LOC 
-# RUN MAKE="make -j $(nproc)" ./rivet-bootstrap
-
-
-# ### Install HEPMC
-# ENV HEPMC_LOC=/herwig/hepmc
-# RUN mkdir $HEP_LOC
-# WORKDIR $HEPMC_LOC
-# RUN wget "http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-2.06.09.tar.gz"
-# RUN tar -xvf HepMC-2.06.09.tar.gz
-# WORKDIR HepMC-2.06.09
-# RUN ./configure --prefix=$INSTALL_LOC --with-momentum=GEV --with-length=MM
-# RUN make -j$(nproc)
-# RUN make check
-# RUN make install
-
-# ### Install GSL
-# ENV GLS_LOC=$INSTALL_LOC/gsl
-# RUN mkdir $GLS_LOC
-# WORKDIR $GLS_LOC
-# RUN wget "http://ftp.heanet.ie/mirrors/gnu/gsl/gsl-2.2.1.tar.gz"
-# RUN tar -xvf gsl-2.2.1.tar.gz
-# WORKDIR gsl-2.2.1
-# RUN ./configure --prefix=$INSTALL_LOC
-# RUN make -j$(nproc)
-# RUN make check
-# RUN make install
-
-# ### Install FastJet
-# ENV FASTJET_LOC=$INSTALL_LOC/fastjet
-# RUN mkdir $FASTJET_LOC
-# WORKDIR $FASTJET_LOC
-# RUN wget http://fastjet.fr/repo/fastjet-3.2.1.tar.gz
-# RUN tar -xvf fastjet-3.2.1.tar.gz
-# WORKDIR fastjet-3.2.1
-# RUN ./configure --prefix=$INSTALL_LOC --enable-allplugins
-# RUN make -j$(nproc)
-# RUN make check
-# RUN make install
-
-# ### Install LHAPDF
-# ENV LHAPDF_LOC=$INSTALL_LOC/fastjet
-# RUN mkdir $LHAPDF_LOC
-# WORKDIR $LHAPDF_LOC
-# RUN wget "https://lhapdf.hepforge.org/downloads/LHAPDF-6.1.6.tar.gz"
-# RUN tar -xvf LHAPDF-6.1.6.tar.gz
-# WORKDIR LHAPDF-6.1.6
-# RUN ./configure --prefix=$INSTALL_LOC --with-boost=$INSTALL_LOC
-# RUN make -j$(nproc)
-# RUN make check
-# RUN make install
-
-# ### Install ThePEG
-# ENV PEG_LOC=$INSTALL_LOC/thepeg
-# RUN mkdir $PEG_LOC
-# WORKDIR $PEG_LOC
-# RUN wget "https://thepeg.hepforge.org/downloads/ThePEG-2.1.0.tar.bz2"
-# RUN tar xjf ThePEG-2.1.0.tar.bz2
-# RUN cd ThePEG-2.1.0
-# RUN ./configure --prefix=$INSTALL_LOC --with-fastjet=$INSTALL_LOC \
-#              --with-gsl=$INSTALL_LOC --with-rivet=$INSTALL_LOC \
-#              --with-hepmc=$INSTALL_LOC --with-lhapdf=$INSTALL_LOC \
-#              --with-boost=$INSTALL_LOC
-# RUN make -j$(nproc)
-# RUN make check
-# RUN make install
-
-### install HERWIG
-WORKDIR $INSTALL_LOC
-RUN wget https://herwig.hepforge.org/downloads/herwig-bootstrap 
-RUN cat herwig-bootstrap
-RUN chmod +x herwig-bootstrap
-RUN ./herwig-bootstrap -j 4 /herwig 
-RUN ls /herwig
+RUN apt-get update -y && \
+    apt-get upgrade -y && \
+    apt-get install -y \
+        nano \
+        vim \
+        pandoc \
+        dvipng \
+        texlive-xetex \
+        texlive \
+        texlive-lang-german \
+        texlive-latex-extra \
+        --upgrade  && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN pip install --upgrade --no-cache-dir \
+    graphviz \
+    jupytext \
+    ipympl \
+    pyarrow \
+    ipywidgets \
+
+RUN source /home/jovyan/herwig_env/bin/activate
 RUN source /herwig/bin/activate
 
 USER $NBUSER
-- 
GitLab