From d352cd7a04164732e70c3ecadd5697836f98da10 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 9 Jul 2018 07:59:34 -0400 Subject: [PATCH] Use compile profile instead of build profile We ran in to some issues with pre-existing bindep files in OpenStack with the 'build' profile. Change to 'compile'. Change-Id: I02e2b350944a67cad9f6ff5e02c6367cce96b942 --- pbrx/container_images.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pbrx/container_images.py b/pbrx/container_images.py index d01517d..4ba8ba1 100755 --- a/pbrx/container_images.py +++ b/pbrx/container_images.py @@ -132,19 +132,19 @@ def build(args): packages = e.stdout.decode('utf-8').strip() try: - build_packages = sh.docker.run( + compile_packages = sh.docker.run( "--rm", "-v", "{pwd}:/usr/src".format(pwd=os.path.abspath(os.curdir)), "bindep", "bindep", "-b", - "build", + "compile", ) except sh.ErrorReturnCode_1 as e: - build_packages = e.stdout.decode('utf-8').strip() + compile_packages = e.stdout.decode('utf-8').strip() packages = packages.replace("\r", "\n").replace("\n", " ") - build_packages = build_packages.replace("\r", "\n").replace("\n", " ") + compile_packages = compile_packages.replace("\r", "\n").replace("\n", " ") # Make place for the wheels to go with tempfile.TemporaryDirectory( @@ -155,8 +155,8 @@ def build(args): # Make temporary container that installs all deps to build wheel # This container also needs git installed for pbr with docker_container("python-base", volumes=[tmp_volume]) as cont: - cont.run("apt-get install -y {build_packages} git".format( - build_packages=build_packages)) + cont.run("apt-get install -y {compile_packages} git".format( + compile_packages=compile_packages)) cont.run("python setup.py bdist_wheel -d /tmp/output") cont.run("chmod -R ugo+w /tmp/output") @@ -171,8 +171,8 @@ def build(args): ) as cont: try: cont.run( - "apt-get install -y {packages} {build_packages}".format( - build_packages=build_packages, packages=packages) + "apt-get install -y {packages} {compile_packages}".format( + compile_packages=compile_packages, packages=packages) ) cont.run("pip install -r requirements.txt") cont.run("pip install --no-deps /tmp/output/*whl dumb-init")