Merge ~cjwatson/launchpad:charm-assets-fix-build into launchpad:master
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 03a8c8937bb36c0128f93a3a966182abf9e81521 |
Merged at revision: | 31e8974697a1499593c01de0837f179f64e02334 |
Proposed branch: | ~cjwatson/launchpad:charm-assets-fix-build |
Merge into: | launchpad:master |
Diff against target: |
117 lines (+36/-7) 5 files modified
charm/launchpad-assets/config.yaml (+4/-0) charm/launchpad-assets/layer.yaml (+0/-2) charm/launchpad-assets/reactive/launchpad-assets.py (+11/-0) charm/launchpad-assets/templates/launchpad-assets-lazr.conf (+17/-1) charm/launchpad-assets/templates/vhost.conf.j2 (+4/-4) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Simone Pelosi | Approve | ||
Jürgen Gmach | Approve | ||
Review via email: mp+445284@code.launchpad.net |
Commit message
charm: Fix assets build arrangements
Description of the change
`launchpad-assets` needs to build the files it serves (particularly API documentation) with the correct `LPCONFIG` so that they embed the correct host names. The previous arrangements of simply running `make build` when creating the virtualenv couldn't possibly achieve this, because the necessary configuration file didn't exist yet. Run `make build` after creating the configuration file instead.
Doing this uncovered various problems with the configuration file we write out: it didn't have enough entries to support running `utilities/
> it didn't have enough entries to support running `utilities/ create- lp-wadl- and-apidoc. py`.
I do not understand what that means.
That certainly should not block a merge. Please go ahead.