From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Fri, 5 Oct 2018 23:51:19 +0000 (-0700)
Subject: Update LaaS Container Build context
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=832201a04a9dc45af9806c087aae68c70bff6a21;p=releng.git

Update LaaS Container Build context

Updates the docker builds for LaaS to share the same context but point
at different Dockerfiles. This way the dashboard code can be copied into
the container instead of requiring to be volume mounted.

Change-Id: I26fe345c8901b772a2e9da56fac71956a8a76583
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 12c3397d8..71359673a 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -150,12 +150,14 @@
           <<: *other-receivers
       - 'pharos-tools-laas-dashboard':
           project: 'pharos-tools'
-          dockerdir: 'dashboard/web'
+          dockerdir: 'dashboard'
+          dockerfile: 'dashboard/web/Dockerfile'
           <<: *master
           <<: *pharos_tools_receivers
       - 'pharos-tools-laas-celery':
           project: 'pharos-tools'
-          dockerdir: 'dashboard/worker'
+          dockerdir: 'dashboard'
+          dockerfile: 'dashboard/worker/Dockerfile'
           <<: *master
           <<: *pharos_tools_receivers
       - 'qtip':