From 2852c8780e40828f208206e2dca57106b3779bc8 Mon Sep 17 00:00:00 2001 From: Julien Leduc <julien.leduc@cern.ch> Date: Wed, 23 Nov 2016 00:41:28 +0100 Subject: [PATCH] trying to use artifacts in Dockerfile --- .gitlab-ci.yml | 3 +-- continuousintegration/docker/ctafrontend/cc7/Dockerfile | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 705c80bd95..a3ef360a61 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 c3ada1a4f4..562d0bc8ed 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 -- GitLab