diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2018-04-11 19:04:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-11 19:04:34 +0000 |
| commit | b41d00ceb80f84dc9e51d3d8c137817c60f707ba (patch) | |
| tree | c660432de2138037637bce13ec33f63772761d7f /jjb/releng | |
| parent | 7e491c8dab6bdc383d86f461a2aea8cf6fd1deb1 (diff) | |
| parent | 474692ef1ca7caa86c98b551106d1432456cff17 (diff) | |
Merge "docker build -f should use relative path to PATH, not working directory"
Diffstat (limited to 'jjb/releng')
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 52b1c7989..0fe76f029 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': @@ -228,25 +228,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 |