From edab75df898d271ce77192431a970a3343b274e4 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Mon, 26 Oct 2020 20:14:51 -0500
Subject: [PATCH] Fixed Docker build
---
.gitlab-ci.yml | 4 ++--
containers/docker/Dockerfile | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e219571b..ff25c033 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,10 +56,10 @@ docker_image_push:
docker_tag:
image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
stage: docker_build
+ rules:
+ - if: '$CI_COMMIT_TAG'
tags:
- silicon
- only:
- - tags
script:
- cd containers/docker && make release
diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile
index 12da657e..bb924406 100644
--- a/containers/docker/Dockerfile
+++ b/containers/docker/Dockerfile
@@ -11,21 +11,21 @@ LABEL maintainer="Whitney Armstrong <warmstrong@anl.gov>" \
RUN cd /tmp \
&& git clone https://eicweb.phy.anl.gov/EIC/NPDet.git \
&& 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 \
&& cd /tmp && rm -rf /tmp/NPDet
RUN cd /tmp \
&& git clone https://eicweb.phy.anl.gov/EIC/eicd.git \
&& 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 \
&& cd /tmp && rm -rf /tmp/eicd
RUN cd /tmp \
&& git clone https://eicweb.phy.anl.gov/EIC/juggler.git \
&& 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 \
&& cd /tmp && rm -rf /tmp/juggler
--
GitLab