Merge lp://staging/~twom/launchpad-buildd/initial-docker-build-support into lp://staging/launchpad-buildd

Proposed by Tom Wardill
Status: Merged
Merged at revision: 413
Proposed branch: lp://staging/~twom/launchpad-buildd/initial-docker-build-support
Merge into: lp://staging/launchpad-buildd
Diff against target: 1478 lines (+1200/-54)
14 files modified
debian/changelog (+10/-4)
lpbuildd/buildd-slave.tac (+2/-0)
lpbuildd/oci.py (+222/-0)
lpbuildd/snap.py (+32/-29)
lpbuildd/target/build_oci.py (+126/-0)
lpbuildd/target/build_snap.py (+7/-15)
lpbuildd/target/cli.py (+2/-0)
lpbuildd/target/lxd.py (+6/-2)
lpbuildd/target/snapbuildproxy.py (+41/-0)
lpbuildd/target/tests/test_build_oci.py (+407/-0)
lpbuildd/target/tests/test_build_snap.py (+1/-1)
lpbuildd/target/tests/test_lxd.py (+4/-3)
lpbuildd/tests/oci_tarball.py (+60/-0)
lpbuildd/tests/test_oci.py (+280/-0)
To merge this branch: bzr merge lp://staging/~twom/launchpad-buildd/initial-docker-build-support
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Colin Watson (community) Approve
Review via email: mp+369775@code.staging.launchpad.net

Commit message

Add initial docker build support

Description of the change

Add a builder for docker, creating an image following a supplied Dockerfile.
Save the image, extract it and then tar each component layer individually for returning/caching in launchpad.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Needs Fixing
393. By Tom Wardill

Use shell_escape, compress output images

394. By Tom Wardill

Collect .tar.gz

395. By Tom Wardill

Use a python script to save docker image to layers

396. By Tom Wardill

Move image extraction to gatherResults

397. By Tom Wardill

Refactor joint proxy handling

398. By Tom Wardill

Fix changelog diff noise

399. By Tom Wardill

Do more preprocessing, create digests file

400. By Tom Wardill

Include all diffs in digests and waiting files

401. By Tom Wardill

Add layer_id to digests now we're using every layer

402. By <email address hidden>

Use docker from apt, rather than from snap

403. By <email address hidden>

Rename Docker to OCI

404. By <email address hidden>

Merge upstream

Revision history for this message
Colin Watson (cjwatson) :
review: Approve
405. By <email address hidden>

Remove conflict marker

406. By <email address hidden>

Use proxy, extract sha from right location

407. By <email address hidden>

Refactor proxy handling into better named mixin

408. By <email address hidden>

Refactor out adding docker proxy

409. By <email address hidden>

Include snap build proxy code

410. By <email address hidden>

Move to an on-the-fly tarball creation

Revision history for this message
Tom Wardill (twom) wrote :

While looking at the launchpad buildbehaviour side of this, realised MP doesn't support build file location.

It should do that.

review: Needs Fixing
411. By <email address hidden>

Argument is build_file, not file

Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Tom Wardill (twom) wrote :

Tested with latest buildbehaviour branch, should now be functional.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches