summaryrefslogtreecommitdiffstats
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2016-12-19bugfix: correct typo in Dockerfileyuyang1-1/+1
JIRA: BOTTLENECK-108 Typo in Dockerfile that causing $BRANCH var not effective Change-Id: I1f156e5b554ebd6f9a1b2d689b1c23c783a4e8af Signed-off-by: yuyang <Gabriel.yuyang@huawei.com>
2016-12-15bugfix:enabling the repo branch choosingyuyang1-1/+1
JIRA: BOTTLENECK-108 Enabling the git repo branch choosing in dockerfile for Bottlenecks. Change-Id: Id03c39e59cb1b38d198ec37f613c9660bcf335cd Signed-off-by: yuyang <Gabriel.yuyang@huawei.com>
2016-12-15bugfix:fix the version support problem of setuptoolsyuyang1-1/+1
JIRA: BOTTLENECK-108 Due the version problem, docker build job fails each time. Change-Id: I179ec56295f344fbd14ffeb8650c8d4625507379 Signed-off-by: yuyang <Gabriel.yuyang@huawei.com>
2016-12-06docker-compose yardstick file changeliyin2-13/+1
JIRA: BOTTLENECK-117 This patch change the docker-compose file. because of yardstick dockerfile. so bottlenecks also need to change the style of docker-compose. Change-Id: Idb82120c5b00ef8595a993886fa3fc0d6b6c4c32 Signed-off-by: liyin <liyin11@huawei.com>
2016-12-01bug fix patchliyin1-2/+2
JIRA: BOTTLENECK-113 this patch fix a problem that docker can't run because of lacking pyroute2. the next is docker-compose file have some error that yardstick can't pull inluxdb container. the next is fix some bug incode. Change-Id: I238b69b456d2810e84bae5c134e6b05a8fc5da63 Signed-off-by: liyin <liyin11@huawei.com>
2016-12-01docker-compose dockerfile changeliyin2-2/+2
JIRA: BOTTLENECK-112 this patch change the yardstick and bottlenecks dockerfile from stable to latest Change-Id: I095957dc6aba25d76bb8e60be97c171c4a59ce57 Signed-off-by: liyin <liyin11@huawei.com>
2016-12-01Add new CI docker build supportyuyang1-0/+3
JIRA: BOTTLENECK-108 Releng has updated the parameter input method. So the Docker file need BRANCH argument to specify the docker image source. Change-Id: I6c8eee3aaf7729964f0b810c209ccdcf9b75a233 Signed-off-by: yuyang <Gabriel.yuyang@huawei.com>
2016-11-28POSCA docker-compose adaptingliyin6-0/+145
JIRA: BOTTLENECK-105 there are files which be need to support docker-compose. some files are docker configure file. some files are used to build docker image. kibana docker is bottlenecks project dashboard. elasticsearch docker is bottlenecks project database. influxdb docker is yardstick project database. yardstick docker is used to run test case. Change-Id: I7f0927c940a400f9f66ac77174f06236a1f4f265 Signed-off-by: liyin <liyin11@huawei.com>
2016-09-29Propose common directory for Docker related filesjose.lausuch1-0/+49
Proposal 3 from this wiki: https://wiki.opnfv.org/display/INF/Docker+handling+in+CI#DockerhandlinginCI-3Dockerfilelocation Do not merge before this: https://gerrit.opnfv.org/gerrit/#/c/22565/ JIRA: RELENG-148 Change-Id: I07e1418ae06c59e6c4d495c8c87d28addbb98d03 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>