diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5790c17581b9fb43c4c7e1bde55665323d86bf8c..e35a1d6f4190f46a9bb6a2aa7e0a87d0513c5229 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 5a2ceadcce204ab99aaaba8b9f6ab84870103abd..e5ef3a3a31efe26665a500d433cac7f7134d0b20 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 \