aboutsummaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
AgeCommit message (Collapse)AuthorFilesLines
2016-12-01Merge "Clone the corresponding branch of the repo according to the job ↵Rex Lee1-2/+2
branch" into stable/colorado
2016-12-01Clone the corresponding branch of the repo according to the job branchjose.lausuch1-2/+2
Make use of the ARG BRANCH given at build time cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$branch ." Change-Id: I44d342bfa5499ebd119e9147695ea82853eb64b6 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com> (cherry picked from commit a8b879387ea8ff072baa6aaf037c6921e354e736)
2016-11-30BugFix: yardstick-docker-build-push failureJingLu51-0/+2
JIRA: YARDSTICK-434 Change-Id: I391403975bf4643c5658e666a165762d690c42bc Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit 97d86789331bb08db8765017867499303d6293b5)
2016-11-30Propose common directory for Docker related filesjose.lausuch1-0/+66
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: I6fc236688389879fd7f62788eaf77d75dc4730cd Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com> (cherry picked from commit 7a99ea3daf7e01936612e1c205ec612a92732ed9)