From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Wed, 11 Apr 2018 02:08:26 +0000 (+0800)
Subject: docker build -f should use relative path to PATH, not working directory
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F55385%2F1;p=releng.git

docker build -f should use relative path to PATH, not working directory

Change-Id: I6b35a5b36b1cc7b8ce2298388b9bb5caf9e44fc9
---

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index f7e92260f..0290ea0a9 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -86,25 +86,25 @@
       - 'clover-ns-nginx-lb':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          dockerfile: 'subservices/lb/Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'clover-ns-nginx-proxy':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          dockerfile: 'subservices/proxy/Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'clover-ns-nginx-server':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          dockerfile: 'subservices/server/Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'clover-ns-snort-ids':
           project: 'clover'
           dockerdir: 'samples/services/snort_ids/docker'
-          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          dockerfile: 'Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'cperf':
@@ -226,25 +226,25 @@
       - 'clover-ns-nginx-lb':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          dockerfile: 'subservices/lb/Dockerfile'
           <<: *fraser
           <<: *other-receivers
       - 'clover-ns-nginx-proxy':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          dockerfile: 'subservices/proxy/Dockerfile'
           <<: *fraser
           <<: *other-receivers
       - 'clover-ns-nginx-server':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          dockerfile: 'subservices/server/Dockerfile'
           <<: *fraser
           <<: *other-receivers
       - 'clover-ns-snort-ids':
           project: 'clover'
           dockerdir: 'samples/services/snort_ids/docker'
-          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          dockerfile: 'Dockerfile'
           <<: *fraser
           <<: *other-receivers
     # yamllint enable rule:key-duplicates