aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/vagrant-onap/lib/_onap_functions
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2017-10-18 09:29:55 -0700
committerVictor Morales <victor.morales@intel.com>2017-10-18 09:36:23 -0700
commitcf26999de441d3e915ee011ddfa31a2bb1b1af15 (patch)
tree388c8623330539f0572088506d3692d1f83d48a4 /bootstrap/vagrant-onap/lib/_onap_functions
parent69cd717348e635d1a55689b22873b751cc5ff2b1 (diff)
Fix proxy usage for docker external
The process that retrieves Docker images hosted externally was missing a step in its configuration. This change fix the configuration and unblock the pending Unit Tests. Change-Id: I5a6b39086eb806bab5bb2667092a154e230d33ef Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: INT-227
Diffstat (limited to 'bootstrap/vagrant-onap/lib/_onap_functions')
-rwxr-xr-xbootstrap/vagrant-onap/lib/_onap_functions5
1 files changed, 2 insertions, 3 deletions
diff --git a/bootstrap/vagrant-onap/lib/_onap_functions b/bootstrap/vagrant-onap/lib/_onap_functions
index 18a465948..cedd6f0a3 100755
--- a/bootstrap/vagrant-onap/lib/_onap_functions
+++ b/bootstrap/vagrant-onap/lib/_onap_functions
@@ -12,7 +12,6 @@ function create_configuration_files {
echo $docker_version > /opt/config/docker_version.txt
}
-# TODO(electrocucaracha): Determine how to use this behind a proxy
# docker_openecomp_login() - Login to OpenECOMP Docker Hub
function docker_openecomp_login {
install_docker
@@ -24,7 +23,7 @@ function pull_openecomp_image {
local image=$1
local tag=$2
docker_openecomp_login
- pull_docker_image $nexus_docker_repo/openecomp/${image}:$docker_version $tag
+ pull_docker_image $nexus_docker_repo/openecomp/${image}:${docker_version-latest} $tag
docker logout
}
@@ -33,7 +32,7 @@ function pull_onap_image {
local image=$1
local tag=$2
docker_openecomp_login
- pull_docker_image $nexus_docker_repo/onap/${image}:$docker_version $tag
+ pull_docker_image $nexus_docker_repo/onap/${image}:${docker_version-latest} $tag
docker logout
}