feat: Support packaging apisix which depends on apisix-openresty #80
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: imjoey <[email protected]>
Signed-off-by: imjoey <[email protected]>
Signed-off-by: imjoey <[email protected]>
imjoey
requested review from
membphis,
nic-chen,
spacewander,
starsz and
tzssangglass
spacewander
reviewed
Aug 26, 2021
README.md
Outdated
| @@ -13,6 +13,7 @@ | |||
| |checkout |True |the code branch or tag of the app which you want to package|checkout=2.1 or checkout=v2.1| | |||
| |version |True |the version of the package|version=10.10| | |||
| |local_code_path |False | the path of local code diretory of apisix or dashboard, which depends on the app parameter|local_code_path=/home/vagrant/apisix| | |||
| |openresty |False |the openresty type that apisix depends on, it's value can be `openresty` or `apisix-openresty`, the default is `openresty`|openresty=apisix-openresty| | |||
There was a problem hiding this comment.
Suggested change
| |openresty |False |the openresty type that apisix depends on, it's value can be `openresty` or `apisix-openresty`, the default is `openresty`|openresty=apisix-openresty| | |
| |openresty |False |the openresty type that apisix depends on, its value can be `openresty` or `apisix-openresty`, the default is `openresty`|openresty=apisix-openresty| |
There was a problem hiding this comment.
Nice catch. Done. Thanks.
| build: | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| BUILD_APISIX_OR_VERSION: 1.17.8.2 |
There was a problem hiding this comment.
The version of APISIX OpenResty is anchored to 1.19.3.2, so specify a version won't take effect.
There was a problem hiding this comment.
@spacewander ok, I see. I will fix this. If user specifies apisix-openresty, its min version is 1.19.3.2.0. Thanks for pointing out.
Signed-off-by: imjoey <[email protected]>
Signed-off-by: imjoey <[email protected]>
spacewander
approved these changes
Aug 26, 2021
Signed-off-by: imjoey <[email protected]>
tzssangglass
approved these changes
Aug 26, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As we all know that apisx-openresty is an enhanced version of openresty, which add more Nginx modules into the raw openresty. Such as multi-upstream, dubbo and lua-var modules, please see https://github.com/api7/apisix-build-tools/blob/master/build-apisix-openresty.sh for details.
Before, the raw openresty is hard-coded as the dependency of the apisix artifacts, so it's impossible to depends on the
apisix-openresty. This PR is going to improve that by addding a new parameteropenrestyfor pakaging. If theopenresty=apisix-openrestyis specified while running themake pakcagecommand, you will be happy to see theapisix.rpmorapisix.debonly depends on theapisix-openresty, instead ofopenresty.Of course, the relative CI for testing is also included in this PR.