Skip to content
Snippets Groups Projects
Commit 17fc6457 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

feat: use eicd from github

parent 1ce099fc
No related branches found
No related tags found
1 merge request!345feat: use eicd from github
...@@ -11,6 +11,7 @@ FROM ${DOCKER_REGISTRY}jug_dev:${INTERNAL_TAG} ...@@ -11,6 +11,7 @@ FROM ${DOCKER_REGISTRY}jug_dev:${INTERNAL_TAG}
ARG EICWEB="https://eicweb.phy.anl.gov/api/v4/projects" ARG EICWEB="https://eicweb.phy.anl.gov/api/v4/projects"
ARG JUGGLER_VERSION="master" ARG JUGGLER_VERSION="master"
ARG NPDET_VERSION="master" ARG NPDET_VERSION="master"
ARG EICD_REPOSITORYURL="https://github.com/eic/eicd.git"
ARG EICD_VERSION="master" ARG EICD_VERSION="master"
## version will automatically bust cache for nightly, as it includes ## version will automatically bust cache for nightly, as it includes
...@@ -18,7 +19,6 @@ ARG EICD_VERSION="master" ...@@ -18,7 +19,6 @@ ARG EICD_VERSION="master"
ARG JUG_VERSION=1 ARG JUG_VERSION=1
ADD ${EICWEB}/18/repository/tree?ref=${NPDET_VERSION} /tmp/18.json ADD ${EICWEB}/18/repository/tree?ref=${NPDET_VERSION} /tmp/18.json
ADD ${EICWEB}/373/repository/tree?ref=${EICD_VERSION} /tmp/373.json
RUN cd /tmp \ RUN cd /tmp \
&& echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info \ && echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info \
&& echo "INSTALLING NPDET" \ && echo "INSTALLING NPDET" \
...@@ -32,8 +32,7 @@ RUN cd /tmp ...@@ -32,8 +32,7 @@ RUN cd /tmp
&& rm -rf build NPDet \ && rm -rf build NPDet \
&& cd /tmp \ && cd /tmp \
&& echo "INSTALLING EICD" \ && echo "INSTALLING EICD" \
&& git clone -b ${EICD_VERSION} --depth 1 \ && git clone -b ${EICD_VERSION} --depth 1 ${EICD_REPOSITORYURL} \
https://eicweb.phy.anl.gov/EIC/eicd.git \
&& cmake -B build -S eicd -DCMAKE_CXX_STANDARD=17 \ && cmake -B build -S eicd -DCMAKE_CXX_STANDARD=17 \
&& cmake --build build -j12 -- install \ && cmake --build build -j12 -- install \
&& pushd eicd \ && pushd eicd \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment