summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-10-05 16:51:19 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2018-10-05 16:51:19 -0700
commit832201a04a9dc45af9806c087aae68c70bff6a21 (patch)
treec754070bcc4ea29ab3df2d2591169e08f99d6f4a
parent54f42524a0507f819df7cab9b1c4832c967c1411 (diff)
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>
-rw-r--r--jjb/releng/opnfv-docker.yaml6
1 files changed, 4 insertions, 2 deletions
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':