x
/
pbrx
Code Issues Proposed changes

Switch from python:slim to python:alpine 

Alpine is smaller. Also, for our first user, Zuul, alpine already has
all the things needed from extra repos (yarn and bubblewrap) Switch to
alpine so we can keep things simple.

NOTE: This isn't going to work until we cut a new release of bindep with
the depends-on patch in it.

Depends-On: https://review.openstack.org/579056
Change-Id: I8c8a3b94b5aa562f54034825c3af871893b4bf89
This commit is contained in:
Monty Taylor 2018-07-12 10:14:08 -05:00
parent 0f6b175d71
commit f49197ffc8
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
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")
# Create base python container which has distro packages updated
with docker_container("python:slim", tag="python-base") as cont:
cont.run("apt-get update")
with docker_container("python:alpine", tag="python-base") as cont:
cont.run("apk update")
log.info("Building bindep container")
# Create bindep container
with docker_container("python-base", tag="bindep") as cont:
cont.run("apt-get install -y lsb-release")
cont.run("pip install bindep")
# 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
log.info("Build wheels in python-base container")
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))
cont.run("python setup.py bdist_wheel -d /tmp/output")
cont.run("chmod -R ugo+w /tmp/output")
@ -183,11 +182,9 @@ def build(args):
) as cont:
try:
cont.run(
"apt-get install -y {packages} {compile_packages}".format(
compile_packages=compile_packages, packages=packages)
"apk add {packages} dumb-init".format(packages=packages)
)
cont.run("pip install -r requirements.txt")
cont.run("pip install --no-deps /tmp/output/*whl dumb-init")
except Exception as e:
print(e.stdout)
raise