diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 705c80bd9558ef997ef0de8c02c43450abb7dfcc..a3ef360a61ca1d4c75f9dbeda74c4153ed55d1e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,7 @@ stages: - - build:dockerimage - build:srpm - build:rpm -# - build:dockerimage + - build:dockerimage cta_srpm: stage: build:srpm diff --git a/continuousintegration/docker/ctafrontend/cc7/Dockerfile b/continuousintegration/docker/ctafrontend/cc7/Dockerfile index c3ada1a4f4bf58a0040b37e8b4fc6c2ee57aed30..562d0bc8edeb463436b3f3cafff34dba0bb47145 100644 --- a/continuousintegration/docker/ctafrontend/cc7/Dockerfile +++ b/continuousintegration/docker/ctafrontend/cc7/Dockerfile @@ -27,8 +27,12 @@ FROM gitlab-registry.cern.ch/linuxsupport/cc7-base ADD ./etc/yum.repos.d/* /etc/yum.repos.d/ RUN yum install -y yum-plugin-priorities epel-release +# Add previously built rpms +ADD ../../../../build_rpm/RPM/RPMS /tmp +#RUN yum -y install cta-frontend cta-debuginfo + # Install needed packages -RUN yum -y install cta-frontend cta-debuginfo cgdb less psmisc lynx strace ltrace +RUN yum -y install cgdb less psmisc lynx strace ltrace RUN yum clean all # Static configuration files