aboutsummaryrefslogtreecommitdiffstats
path: root/docker_merge.sh
AgeCommit message (Collapse)AuthorFilesLines
2017-06-29[POLICY-54] Add proxy for docker builds and fixesShashank Kumar Shankar1-1/+9
This patch helps to build Policy docker images behind a proxy and fixes the following correction in patch https://gerrit.onap.org/r/#/c/5585/ : 1. $HTTP_PROXY and $HTTPS_PROXY environment variables gets reset with HTTP_PROXY="" and HTTP_PROXY="" overriding it. 2. When both $HTTP_PROXY and $HTTPS_PROXY are set, a space is needed when they are appended for providing correct arguments to docker build command. Change-Id: I1d0f2003c77444e372b754d42f20d2e428e70a95 Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
2017-03-30update Dockerfile to onapPamela Dragosh1-0/+22
Change-Id: I9c5229cdc79a7dfc5f74d919c58aa579084fef55 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-03-30update to ONAPPamela Dragosh1-6/+6
Change-Id: I52ddbe21bc6ba9922bcd70ff41c754c7d20098b5 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-03-24changing to NEXUS_DOCKER_REPO via Marco. TagsPamela Dragosh1-10/+35
Change-Id: I8cdbf98141070f89dd3c668a1aa3317fc9df2683 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-03-16oops forgot the docker buildPamela Dragosh1-0/+3
Change-Id: If79edd8753f866d8700c462f1ceeb55533e3dcf5 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-03-16getting better requirementsPamela Dragosh1-7/+13
Change-Id: I47ba52cb95a1bbe20eca81854109c0ef6db0b808 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-03-15need version.propertiesPamela Dragosh1-0/+7
Change-Id: I0df86bbb80535584a89e46c8b4cfddca18d2c3bd Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-03-08update docker image tagsPamela Dragosh1-5/+12
Change-Id: I207a68c761ccc2770ac13539595a79f5e176d611 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-02-23cleaning up - better verify/mergePamela Dragosh1-0/+20
Change-Id: Ief6428eefa6faed69236c9c481e500a0e7948e0b Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>