Commit 1c3344a5 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

modified: .containers/Dockerfile.in

	modified:   .gitlabci/configure.sh
parent b8d06008
...@@ -22,7 +22,7 @@ RUN cd /tmp \ ...@@ -22,7 +22,7 @@ RUN cd /tmp \
&& cd /tmp && rm -rf /tmp/eicd && cd /tmp && rm -rf /tmp/eicd
RUN cd /tmp \ RUN cd /tmp \
&& git clone https://eicweb.phy.anl.gov/EIC/juggler.git \ && git clone -b @JUGGLER_BRANCH@ https://eicweb.phy.anl.gov/EIC/juggler.git \
&& mkdir -p juggler/build && cd juggler/build \ && mkdir -p juggler/build && cd juggler/build \
&& cmake ../. -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=/usr/local \ && cmake ../. -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=/usr/local \
&& make -j30 && make -j4 install \ && make -j30 && make -j4 install \
......
...@@ -6,9 +6,15 @@ ...@@ -6,9 +6,15 @@
## Known variables that will be substituted: ## Known variables that will be substituted:
## @EIC_TAG@ - docker tag used for the EIC container ## @EIC_TAG@ - docker tag used for the EIC container
## @JUGGLER_TAG@ - output tag for the Juggler version ## @JUGGLER_TAG@ - output tag for the Juggler version
## @JUGGLER_BRANCH@ - Juggler git branch for build
TEMPLATE_FILE=$1 TEMPLATE_FILE=$1
OUTPUT_FILE=${TEMPLATE_FILE%.*} OUTPUT_FILE=${TEMPLATE_FILE%.*}
JUGGLER_BRANCH="master"
if [ -n "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ] ; then
JUGGLER_BRANCH=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
fi
echo "Configuring CI file: ${TEMPLATE_FILE}" echo "Configuring CI file: ${TEMPLATE_FILE}"
echo "Output will be written to: ${OUTPUT_FILE}" echo "Output will be written to: ${OUTPUT_FILE}"
...@@ -16,6 +22,8 @@ echo "Output will be written to: ${OUTPUT_FILE}" ...@@ -16,6 +22,8 @@ echo "Output will be written to: ${OUTPUT_FILE}"
TAG=$EIC_VERSION TAG=$EIC_VERSION
sed "s/@EIC_TAG@/$EIC_TAG/g" $TEMPLATE_FILE | \ sed "s/@EIC_TAG@/$EIC_TAG/g" $TEMPLATE_FILE | \
sed "s/@JUGGLER_TAG@/$JUGGLER_TAG/g" > ${OUTPUT_FILE} sed "s/@JUGGLER_TAG@/$JUGGLER_TAG/g" | \
sed "s/@JUGGLER_BRANCH@/$JUGGLER_BRANCH/g" > ${OUTPUT_FILE}
echo "Done" echo "Done"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment