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.

Sign up for GitHub

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

[THREESCALE-362] upgrade openresty to 1.13.6.1 #480

Merged
merged 1 commit into from
Nov 14, 2017
+12 −7
Merged

[THREESCALE-362] upgrade openresty to 1.13.6.1 #480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -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-rover2"
OPENRESTY_VERSION: "1.13.6.1-rover2"
steps:
- run: apk update && apk add wget make bash curl py-pip git openssh-client
- run: |
@@ -37,7 +37,7 @@ jobs:
- run: make prove-docker
build:
docker:
- image: quay.io/3scale/s2i-openresty-centos7:1.11.2.5-1-rover2
- image: quay.io/3scale/s2i-openresty-centos7:1.13.6.1-rover2
environment:
TEST_NGINX_BINARY: openresty
LUA_BIN_PATH: /opt/app-root/bin
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Update the s2i-openresty image to have the same path (`/opt/app-root/src`) in all images [PR #460](https://github.com/3scale/apicast/pull/460)
- Launcher scripts are now Perl + Lua instead of Shell [PR #449](https://github.com/3scale/apicast/pull/449)
- Unify how to connect to 3scale backend [PR #456](https://github.com/3scale/apicast/pull/456)
- Upgraded OpenResty to 1.13.6.1 [PR #480](https://github.com/3scale/apicast/pull/480)

### Fixed

14 changes: 9 additions & 5 deletions Vagrantfile
View file
Original file line number Diff line number Diff line change
@@ -41,9 +41,13 @@ Vagrant.configure("2") do |config|
config.vm.synced_folder ".", "/home/vagrant/app"

config.vm.provision "shell", inline: <<-'SHELL'
set -x -e
yum -y install yum-utils
# Install OpenResty and other tools
yum-config-manager --add-repo https://openresty.org/yum/centos/OpenResty.repo
yum -y install openresty-resty openresty-debuginfo openresty-pcre-debuginfo systemtap git epel-release httpd-tools
yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo

yum -y install openresty-resty openresty-debuginfo openresty-pcre-debuginfo
yum -y install systemtap git epel-release httpd-tools
yum -y install luarocks

yum -y groupinstall 'Development Tools'
@@ -71,6 +75,9 @@ Vagrant.configure("2") do |config|
echo 'pathmunge lua_modules/bin' > /etc/profile.d/rover.sh
chmod +x /etc/profile.d/rover.sh

mkdir -p /usr/share/lua/5.1/luarocks/
curl -L https://raw.githubusercontent.com/3scale/s2i-openresty/ffb1c55533be866a97466915d7ef31c12bae688c/site_config.lua > /usr/share/lua/5.1/luarocks/site_config.lua

# Install APIcast dependencies
(cd app && make dependencies)

@@ -84,9 +91,6 @@ Vagrant.configure("2") do |config|
# Allow vagrant user to use systemtap
usermod -a -G stapusr,stapdev vagrant

mkdir -p /usr/share/lua/5.1/luarocks/
curl -L https://raw.githubusercontent.com/3scale/s2i-openresty/ffb1c55533be866a97466915d7ef31c12bae688c/site_config.lua > /usr/share/lua/5.1/luarocks/site_config.lua

# Raise opened files limit for vagrant user
echo -e 'vagrant\t\t\t-\tnofile\t\t1000000' > /etc/security/limits.d/90-nofile.conf
SHELL