x
/
pbrx
Code Issues Proposed changes

Merge "Switch from python:slim to python:alpine"

This commit is contained in:
Zuul 2018-07-12 16:36:18 +00:00 committed by Gerrit Code Review
parent 09f68422d3 f49197ffc8
commit 94fb9c820d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pbrx/container_images.py
View File

@ -116,13 +116,12 @@ def build(args):
log.info("Building base python container") log.info("Building base python container")
# Create base python container which has distro packages updated # Create base python container which has distro packages updated
with docker_container("python:slim", tag="python-base") as cont: with docker_container("python:alpine", tag="python-base") as cont:
cont.run("apt-get update") cont.run("apk update")
log.info("Building bindep container") log.info("Building bindep container")
# Create bindep container # Create bindep container
with docker_container("python-base", tag="bindep") as cont: with docker_container("python-base", tag="bindep") as cont:
cont.run("apt-get install -y lsb-release")
cont.run("pip install bindep") cont.run("pip install bindep")
# Use bindep container to get list of packages needed in the final # Use bindep container to get list of packages needed in the final
@ -166,7 +165,7 @@ def build(args):
# This container also needs git installed for pbr # This container also needs git installed for pbr
log.info("Build wheels in python-base container") log.info("Build wheels in python-base container")
with docker_container("python-base", volumes=[tmp_volume]) as cont: with docker_container("python-base", volumes=[tmp_volume]) as cont:
cont.run("apt-get install -y {compile_packages} git".format( cont.run("apk add {compile_packages} git".format(
compile_packages=compile_packages)) compile_packages=compile_packages))
cont.run("python setup.py bdist_wheel -d /tmp/output") cont.run("python setup.py bdist_wheel -d /tmp/output")
cont.run("chmod -R ugo+w /tmp/output") cont.run("chmod -R ugo+w /tmp/output")
@ -183,11 +182,9 @@ def build(args):
) as cont: ) as cont:
try: try:
cont.run( cont.run(
"apt-get install -y {packages} {compile_packages}".format( "apk add {packages} dumb-init".format(packages=packages)
compile_packages=compile_packages, packages=packages)
) )
cont.run("pip install -r requirements.txt") cont.run("pip install -r requirements.txt")
cont.run("pip install --no-deps /tmp/output/*whl dumb-init")
except Exception as e: except Exception as e:
print(e.stdout) print(e.stdout)
raise raise