Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update GBL version to v3.1 #16

Merged
merged 3 commits into from
Apr 5, 2023
Merged

update GBL version to v3.1 #16

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abb799f
update GBL version to v3.1
tomeichlersmith Apr 4, 2023
3b60e8c
patch to maven
tomeichlersmith Apr 4, 2023
ff261f6
need cpp subdirectory when building cpp library
tomeichlersmith Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions context/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ ENV PKG_CONFIG_PATH=/opt/rh/devtoolset-8/root/usr/lib64/pkgconfig
# and then setting appropriate environment variables
###############################################################################
LABEL java.version="15.1.0"
LABEL mvn.version="3.9.0"
LABEL mvn.version="3.9.1"
ENV JAVA_HOME=/usr/local/java
ENV MVN_HOME=/usr/local/mvn
ENV PATH=${JAVA_HOME}/bin:${MVN_HOME}/bin:${PATH}
Expand All @@ -112,7 +112,7 @@ RUN mkdir ${JAVA_HOME} ${MVN_HOME} &&\
https://download.java.net/java/GA/jdk15.0.1/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/openjdk-15.0.1_linux-x64_bin.tar.gz |\
${__untar} ${JAVA_HOME} &&\
${__wget} --no-check-certificate \
https://dlcdn.apache.org/maven/maven-3/3.9.0/binaries/apache-maven-3.9.0-bin.tar.gz |\
https://dlcdn.apache.org/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.tar.gz |\
${__untar} ${MVN_HOME}

###############################################################################
Expand Down Expand Up @@ -188,21 +188,17 @@ RUN mkdir src &&\
###############################################################################
# GeneralBrokenLines
###############################################################################
LABEL gbl.version=2.2.0
RUN mkdir src &&\
${__wget} https://github.com/pbutti/GeneralBrokenLines/tarball/master |\
${__untar} src &&\
echo "# removed on purpose" > src/cpp/cmake/ilcsoft_default_install_prefix.cmake &&\
LABEL gbl.version="V03-01-00"
RUN git clone --depth 1 --branch V03-01-00 \
https://gitlab.desy.de/claus.kleinwort/general-broken-lines.git &&\
cmake \
-DCMAKE_INSTALL_PREFIX=${__prefix} \
-B src/cpp/build \
-S src/cpp \
&&\
-B general-broken-lines/build \
-S general-broken-lines/cpp \
-DCMAKE_INSTALL_PREFIX=/usr/local &&\
cmake \
--build src/cpp/build \
--target install \
&&\
rm -rf src
--build general-broken-lines/build \
--target install &&\
rm -rf general-broken-lines

################################################################################
# Xerces-C
Expand Down