Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use new s2i-openresty with rover integration #460

Merged
merged 11 commits into from
Oct 25, 2017
Merged

use new s2i-openresty with rover integration #460

merged 11 commits into from
Oct 25, 2017

Conversation

mikz
Copy link
Contributor

@mikz mikz commented Oct 23, 2017

Extracted from #449

Use rover provided by 3scale/s2i-openresty#38

This change requires APIcast to start with a different prefix than the current source code because the directory is not writeable anymore.

ldoc 1.4.6-2
liquid scm-1
lua-resty-env 0.4.0-1
lua-resty-execvp 0.1.0-1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be updated. Those dependencies are not there yet.

because only apicast directory is uploaded to s2i image
@mikz mikz changed the title [wip] use rover use new s2i-openresty with rover integration Oct 23, 2017
@mikz mikz requested a review from davidor October 23, 2017 16:14
@@ -7,7 +7,7 @@ jobs:
environment:
S2I_VERSION: "1.1.7-226afa1"
DOCKER_COMPOSE_VERSION: "1.16.1"
OPENRESTY_VERSION: "1.11.2.5-1"
OPENRESTY_VERSION: "rover"
Copy link
Contributor

@davidor davidor Oct 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few lines below there's: quay.io/3scale/s2i-openresty-centos7:1.11.2.5-2. (Notice that the openresty version doesn't match 😱 )
Should it be adapted to use rover as well?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, with this change, we'll no longer have documented the openresty version we are using.
Maybe we should use something like "rover-1.11.2.5-1" ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. I don't intend to merge it pointing to rover. After this is ready I'll merge the rover branch and do a new release of the s2i image with a correct version.

@@ -0,0 +1,4 @@
-- vim: set ft=lua:
rocks_trees = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a comment explaining this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. Will do.

@mikz mikz force-pushed the rover branch 2 times, most recently from 016406d to a48c2f4 Compare October 25, 2017 11:54
@mikz mikz merged commit dcf4498 into master Oct 25, 2017
@mikz mikz deleted the rover branch October 25, 2017 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants