Removed some commented out content

Changed to explicity apr21_patches tag.

Removed some commented out content
Changed to explicity apr21_patches tag.
d5100e5e · Eoin Clerkin · dbc60712 · d5100e5e
Commit d5100e5e authored Dec 07, 2021 by Eoin Clerkin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 131 deletions

fairsoft/Dockerfile fairsoft/Dockerfile +3 -131

No files found.
--- a/fairsoft/Dockerfile
+++ b/fairsoft/Dockerfile
@@ -3,8 +3,6 @@
 ARG BASE_IMAGE=debian

 ARG FS_TAG="apr21_patches"
-ARG FR_TAG="v18.4_patches"
-

 FROM $BASE_IMAGE
 RUN apt-get -y update && apt-get -y upgrade
@@ -12,7 +10,7 @@ RUN apt-get -y update && apt-get -y upgrade
 # Cloning Repo
 RUN apt-get -y install git
 RUN mkdir -p /opt/fairsoft/source /opt/fairsoft/build /opt/fairsoft/install
-RUN git clone https://github.com/FairRootGroup/FairSoft.git -b ${FS_TAG} /opt/fairsoft/source
+RUN git clone https://github.com/FairRootGroup/FairSoft.git -b apr21_patches /opt/fairsoft/source

 # Bootstrapping cmake
 RUN apt-get -y install curl
@@ -36,132 +34,6 @@ RUN cmake \
 RUN cd /opt/fairsoft/build && make -j`nproc`

 # Configuring system
-RUN export PATH=/opt/fairsoft/install:$PATH
-RUN  . /opt/fairsoft/install/bin/thisroot.sh
+ENV PATH=/opt/fairsoft/install:$PATH
+#RUN  /opt/fairsoft/install/bin/thisroot.sh
 WORKDIR /tmp
-
-
-
-
-
-
-
-# FairRoot
-#RUN mkdir -p /opt/fairroot/build /opt/fairroot/install
-#RUN git clone https://github.com/FairRootGroup/FairRoot.git /opt/fairroot/source
-
-
-
-
-
-
-
-
-#RUN apt-get -y install cmake cmake-data g++ gcc gfortran \
-#  debianutils build-essential make patch sed \
-#  libx11-dev libxft-dev libxext-dev libxpm-dev libxmu-dev \
-#  libglu1-mesa-dev libgl1-mesa-dev \
-#  libncurses5-dev curl libcurl4-openssl-dev bzip2 libbz2-dev gzip unzip tar \
-#  subversion git xutils-dev flex bison lsb-release python-dev \
-#  libxml2-dev wget libssl-dev libkrb5-dev \
-#  automake autoconf libtool, \
-#  libc6-dev apt-utils
-#
-#ENV SIMPATH="/opt/fairsoft/install"\
-#    G4INCLDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4INCL1.0"\
-#    G4LEVELGAMMADATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/PhotonEvaporation5.3"\
-#    G4RADIOACTIVEDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/RadioactiveDecay5.3"\
-#    G4PIIDATA="/opt/fairsoft/share/install/Geant4-10.5.1/data/G4PII1.3"\
-#    G4SAIDXSDATA="/opt/fairsoft/share/install/Geant4-10.5.1/data/G4SAIDDATA2.0"\
-#    G4ABLADATA="/opt/fairsoft/share/install/Geant4-10.5.1/data/G4ABLA3.1"\
-#    G4REALSURFACEDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/RealSurface2.1.1"\
-#    G4NEUTRONHPDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4NDL4.5"\
-#    G4PARTICLEXSDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4PARTICLEXS1.1"\
-#    G4ENSDFSTATEDATA="/opt/fairsoft/install/share/install/Geant4-10.5.1/data/G4ENSDFSTATE2.2"\
-#    G4LEDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4EMLOW7.7"
-#
-## RUN apt-get update && \
-##    apt-get -y upgrade && \
-##    apt-get -y install cmake cmake-data g++ gcc gfortran \
-##    debianutils build-essential make patch sed \
-##    libx11-dev libxft-dev libxext-dev libxpm-dev libxmu-dev \
-##    libglu1-mesa-dev libgl1-mesa-dev \
-##    libncurses5-dev curl libcurl4-openssl-dev bzip2 libbz2-dev gzip unzip tar \
-##    subversion git xutils-dev flex bison lsb-release python-dev \
-## libc6-dev 
-#
-#RUN apt-get -y install vim davix-dev libsqlite3-0 libsqlite3-dev
-#
-##
-## FairSoft
-##
-#
-##ADD ./fairsoft.conf ./rootconfig.sh /tmp/
-#
-#RUN mkdir -p /opt/fairsoft/source /opt/fairsoft/build /opt/fairsoft/install
-#
-#RUN git clone https://github.com/FairRootGroup/FairSoft.git -b ${GIT_TAG} /opt/fairsoft/source
-#
-#RUN cd /opt/fairsoft/source/legacy && pwd 1>&2 && sh setup-debian.sh
-#
-#RUN cd /opt && cmake -S /opt/fairsoft/source -B /opt/fairsoft/build -C /opt/fairsoft/source/FairSoftConfig.cmake -DCMAKE_INSTALL_PREFIX=/opt/fairsoft/install
-#
-#RUN cd /opt/fairsoft/build && make -j12
-#
-##RUN cd /opt/fairsoft && ls -lart 1>&2 && cd legacy && pwd 1>&2 && ls -lart 1>&2
-#
-##RUN cd /opt/fairsoft && ls -lart 1>&2 && . ./legacy/make_clean.sh all true 1>&2
-#
-##ARG PATH_TO_SOURCE=/opt/fairsoft
-##ARG PATH_TO_BUILD=/opt/fairsoft/build
-#
-##RUN cmake -S ${PATH_TO_SOURCE} -B ${PATH_TO_BUILD} -C ${PATH_TO_SOURCE}/FairSoftConfig.cmake
-##RUN cmake --build ${PATH_TO_BUILD}
-#
-##RUN  cp ./rootconfig.sh FairSoft/tools && cd FairSoft && ./configure.sh ../fairsoft.conf && ./make_clean.sh all
-#
-#ENV PATH="${SIMPATH}/bin:${PATH}"
-#
-###################################WORKDIR /opt/fairsoft/install
-ARG BASE_IMAGE=fairsoft:latest
-
-FROM $BASE_IMAGE
-
-
-WORKDIR /opt
- 
-ENV ROOTSYS="/opt/fairsoft/install"\
-    ROOT_LIBRARY_DIR="/opt/fairsoft/install/lib/root"\
-    ROOT_LIBRARIES="-L/opt/fairsoft/install/lib/root -lGui -lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTVecOps -lTree -lTreePlayer -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread -lMultiProc -lROOTDataFrame -pthread -Wl,-rpath,/opt/fairsoft/install/lib/root -lm -ldl -rdynamic"\
-    ROOT_INCLUDE_DIR="/opt/fairsoft/install/include/root6"\
-    ROOT_INCLUDE_PATH="/opt/cbmroot/install/include:/opt/fairroot/install/include:/opt/fairsoft/install/include/TGeant3"\ 
-    PYTHONPATH="/opt/cbmroot/install/lib:/opt/fairsoft/install/lib:/opt/fairsoft/install/lib/root:/opt/fairsoft/install/lib/Geant4:/opt/fairsoft/nstall/lib/g4py"\ 
-    LD_LIBRARY_PATH="/opt/cbmroot/install/lib:/opt/fairroot/install/lib:/opt/fairsoft/install/lib:/opt/fairsoft/install/lib/root:$LD_LIBRARY_PATH"\
-    PATH="/opt/fairsoft/install/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
-
-ENV	SIMPATH="/opt/fairsoft/install"\
-	G4ENSDFSTATEDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4ENSDFSTATE2.2"\
-	G4PIIDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4PII1.3"\
-	G4INCLDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4INCL1.0"\
-	G4LEDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4EMLOW7.7"\
-	G4PARTICLEXSDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4PARTICLEXS1.1"\
-	G4NEUTRONHPDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4NDL4.5"\
-	G4SAIDXSDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4SAIDDATA2.0"\
-	G4REALSURFACEDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/RealSurface2.1.1"\
-	G4ABLADATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/G4ABLA3.1"\
-	G4LEVELGAMMADATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/PhotonEvaporation5.3"\
-	G4RADIOACTIVEDATA="/opt/fairsoft/install/share/Geant4-10.5.1/data/RadioactiveDecay5.3"
-
-RUN mkdir -p /opt/fairroot/build /opt/fairroot/install 
-
-RUN git clone https://github.com/FairRootGroup/FairRoot.git /opt/fairroot/source 
-
-RUN cd /opt/fairroot/source && git switch ${FR_TAG} && cd /opt/fairroot
-RUN cmake -S /opt/fairroot/source -B /opt/fairroot/build -DCMAKE_INSTALL_PREFIX=/opt/fairroot/install -DCMAKE_BUILD_TYPE=RELEASE
-
-RUN cd /opt/fairroot && make -C build -j`nproc` install
-
-ENV FAIRROOTPATH=/opt/fairroot/install
-
-RUN . /opt/fairroot/install/bin/FairRootConfig.sh -a
-RUN echo " . /opt/fairroot/install/bin/FairRootConfig.sh -a" > /etc/profile.d/fairroot.sh