Merge ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:image-builder into charm-k8s-bind:master
Proposed by
Barry Price
Status: | Merged |
---|---|
Approved by: | Tom Haddon |
Approved revision: | 55f728221f7857cd037d987b73eca4dec1a36bb1 |
Merged at revision: | af1d0d984eb1a91518747540bbddab2ce012fcfe |
Proposed branch: | ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:image-builder |
Merge into: | charm-k8s-bind:master |
Diff against target: |
133 lines (+96/-1) 5 files modified
.jujuignore (+7/-0) Makefile (+23/-1) dockerfile (+33/-0) image-scripts/dns-check.sh (+10/-0) image-scripts/docker-entrypoint.sh (+23/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tom Haddon | Approve | ||
Canonical IS Reviewers | Pending | ||
Review via email: mp+388449@code.launchpad.net |
Commit message
Migrate the image builder here from its own branch, use .jujuignore to ensure charmcraft doesn't include those parts in our built charm
To post a comment you must log in.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.