Commit edab75df authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Fixed Docker build

parent c0ccf4db
...@@ -56,10 +56,10 @@ docker_image_push: ...@@ -56,10 +56,10 @@ docker_image_push:
docker_tag: docker_tag:
image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
stage: docker_build stage: docker_build
rules:
- if: '$CI_COMMIT_TAG'
tags: tags:
- silicon - silicon
only:
- tags
script: script:
- cd containers/docker && make release - cd containers/docker && make release
...@@ -11,21 +11,21 @@ LABEL maintainer="Whitney Armstrong <warmstrong@anl.gov>" \ ...@@ -11,21 +11,21 @@ LABEL maintainer="Whitney Armstrong <warmstrong@anl.gov>" \
RUN cd /tmp \ RUN cd /tmp \
&& git clone https://eicweb.phy.anl.gov/EIC/NPDet.git \ && git clone https://eicweb.phy.anl.gov/EIC/NPDet.git \
&& mkdir -p NPDet/build && cd NPDet/build \ && mkdir -p NPDet/build && cd NPDet/build \
&& cmake ../. -DCMAKE_CXX_STANDARD=20 -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 \
&& cd /tmp && rm -rf /tmp/NPDet && cd /tmp && rm -rf /tmp/NPDet
RUN cd /tmp \ RUN cd /tmp \
&& git clone https://eicweb.phy.anl.gov/EIC/eicd.git \ && git clone https://eicweb.phy.anl.gov/EIC/eicd.git \
&& mkdir -p eicd/build && cd eicd/build \ && mkdir -p eicd/build && cd eicd/build \
&& cmake ../. -DCMAKE_CXX_STANDARD=20 -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 \
&& 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 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=20 -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 \
&& cd /tmp && rm -rf /tmp/juggler && cd /tmp && rm -rf /tmp/juggler
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