From 0bb57764b3f665d278d87da5f22863d8be6c8585 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Fri, 28 Aug 2020 12:57:30 -0500
Subject: [PATCH] CI still broken modified: .gitlab-ci.yml
modified: containers/docker/Dockerfile
---
.gitlab-ci.yml | 2 +-
containers/docker/Dockerfile | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5790c17..e35a1d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ hcana_docker:
tags:
- eic0 docker
script:
- #- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- cd containers/docker && make release
hcana_singularity:
diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile
index 5a2cead..e5ef3a3 100644
--- a/containers/docker/Dockerfile
+++ b/containers/docker/Dockerfile
@@ -26,7 +26,9 @@ RUN ls -lrth /usr/local/lib/lib*.so \
&& git clone https://eicweb.phy.anl.gov/jlab/hallc/analyzer_software/analyzer.git \
&& mkdir analyzer/build && cd analyzer/build && git pull && git checkout master\
&& cmake ../. && make -j20 VERBOSE=1 && make install \
- && cd /tmp && rm -rf analyzer \
+ && cd /tmp && rm -rf analyzer
+
+RUN cd /tmp \
&& git clone https://eicweb.phy.anl.gov/jlab/hallc/hcana.git \
&& mkdir hcana/build && cd hcana/build \
&& git pull \
--
GitLab