x
/
pbrx
Code Issues Proposed changes

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
This commit is contained in:
Monty Taylor 2018-07-09 07:59:34 -04:00
parent 002003ee21
commit d352cd7a04
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pbrx/container_images.py
View File

@ -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")