Skip to content
Snippets Groups Projects
Commit 7f18603f authored by Mike Marchetti's avatar Mike Marchetti
Browse files

Fix repo base url to return only url


Change-Id: Ic7e3faf53fd193a3075352430fa43f74c7aa3e85
Signed-off-by: default avatarMike Marchetti <mmarchetti@sandvine.com>
parent f3186d55
No related branches found
No related tags found
No related merge requests found
......@@ -58,7 +58,7 @@ def lxc_file_push(container_name,file,destination) {
def start_http_server(repo_dir,server_name) {
sh "docker run -dit --name ${server_name} -v ${repo_dir}:/usr/local/apache2/htdocs/ httpd:2.4"
def http_server_ip = sh(returnStdout:true, script: "docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${server_name}").trim()
return "-u http://${http_server_ip}/"
return "http://${http_server_ip}/"
}
def lxc_get_file(container_name,file,destination) {
......
......@@ -156,7 +156,7 @@ node("${params.NODE}") {
error = null
if ( params.DO_BUILD ) {
stage("Build") {
sh "make -j4 -C docker CMD_DOCKER_ARGS= TAG=${container_name} RELEASE=${params.RELEASE} REPOSITORY_BASE=${repo_base_url} REPOSITORY_KEY=${params.REPO_KEY_NAME} REPOSITORY=${params.REPOSITORY}"
sh "make -j4 -C docker CMD_DOCKER_ARGS= TAG=${container_name} RELEASE=${params.RELEASE} REPOSITORY_BASE=${repo_base_url} REPOSITORY_KEY=${params.REPO_KEY_NAME} REPOSITORY=${params.REPO_DISTRO}"
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment