Merge pull request #428 from 3scale/upgrade-openresty

upgrade openresty
3scale · Sep 15, 2017 · 50cf4ec · 50cf4ec
2 parents f1274cb + a10c4b3
commit 50cf4ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,6 +7,7 @@ jobs:
     environment:
       S2I_VERSION: "1.1.7-226afa1"
       DOCKER_COMPOSE_VERSION: "1.16.1"
+      OPENRESTY_VERSION: "1.11.2.5-1"
     steps:
       - run: apk update && apk add wget make bash curl py-pip git openssh-client
       - run: |
@@ -36,9 +37,10 @@ jobs:
       - run: make prove-docker
   build:
     docker:
-      - image: quay.io/3scale/s2i-openresty-centos7:luarocks-build
+      - image: quay.io/3scale/s2i-openresty-centos7:1.11.2.5-1
         environment:
           TEST_NGINX_BINARY: openresty
+          LUA_BIN_PATH: /opt/app-root/bin
       - image: redis:3.2.8-alpine
     working_directory: /opt/app-root/apicast
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## Changed
+
+- Upgraded to OpenResty 1.11.2.5-1 [PR #428](https://github.com/3scale/apicast/pull/428)
+
 ## [3.1.0-rc1] - 2017-09-14
 
 ### Added

diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ SHELL=/bin/bash -o pipefail
 SEPARATOR="\n=============================================\n"
 
 IMAGE_NAME ?= apicast-test
-OPENRESTY_VERSION ?= 1.11.2.3-6
+OPENRESTY_VERSION ?= master
 BUILDER_IMAGE ?= quay.io/3scale/s2i-openresty-centos7:$(OPENRESTY_VERSION)
 RUNTIME_IMAGE ?= $(BUILDER_IMAGE)-runtime