Merge pull request #239 from 3scale/travis-s2i

use latest s2i-openresty

.travis.yml

@@ -31,7 +31,7 @@ env:
   - secure: LLEaIHNfFqblICN7o2KrThFAXAuIwmc1ZMvSVgd6CXDi5FAZNhtwl35hKNOUiyTdvAuDWrJT503UoCnEwrJeKKGbpcjBC6hIgaXy8+K1UU5zh47D7bzOkuXmSv/FrRl6bqfulD7kjERQEozj6DJleNbBHmUckc2j89pdXca9d7lBzYeFMJFDDKhnIVRdTVUSjd1ccQNyEdP1a74gUI5rxKK79ynHPKgF3OneYNZLySkASoud/8i/30uop8gKwqyavQVkMXlhEkAHY1CSHiKo5mUQ5NR5fBl7ZBCFeKJ2h8DQI+R3BHbaA/mzmnacTE8B+w03d8OylZQCDhYdfNqQWBWOO1V0fpYc860Nf6TfMWuCzIG4zbOrweubOM67Tmrfw7wg8FhdXZPxNjlHUIkAVutC7KqM/h9I8cVdwNyp026mCG0pxZ/OrpoJl++S7+bIWBmtR6lP3s78t3K/FG3a3JsIfUgdZuscVpjqKkJ9RkT1v8dWWJULLJONJMZa39lblS1amcw6ZQeL0z6ILJ5Zr0JSEbtPyC/CXErrtV610xnhmcKb9XNpWZmqRaTT6EXtl06kaDoz6PYmeNUvgGfHrOSEU49iK+poDCFOIYNRFQuuQEk63O94OKWI1gT8BbJEqoUkSLochXpuKmkK80ctNXfWefwPDhVv1LQqFwp9hsQ=
   - secure: UtFN6c5cd7KEfqBanUEeNSBZ7WtTM4JEQYlQJIefcN41Duse3qSEjNs6uMtJWn6PVB1NPLAbbZ2lwbznI56M1gNQXdHrVjInK90fo28zftG+8iSYpbPEuYIvyDIvLXtCJx0TT09DOzU9g5a8psfqYhnC3N3uBwStXoLLlxjf3fu5JISVpIA1CzGOB0xVmrbybWNyvjZlf5PXBqaYlIEuxB/t0O68J3duaJZFDLNjJVDtwzuzGyGS+w+R6YcasRoEpB2iGpaAAGAdOPoKznZqLm9aY+rQkMmXvQWWDtN+vpe6HqlOmkSgZjY//vLN/Hc0CMKsKxZ78FEe6C3zhWE+z2nQuvsdHOQ9DEHms6uRN9oOswvE6iKhJlKCbEPn/6gFTja/DCh/hUrsszTQC6x4BurfZAg/qHH2LViDfc7zX+Mh22e2gRsUH+nl+UweuFgHmpXDDeJEdL/luEFB8oo/HScGUgmUBRRfwq6I7C35QIl7ah5mql0l8IIOO+R7aPP290zm4lW/g7RXbPxqedJQBNiEHGrosKygonoYvBjnx4LBu2Qdwq6GNAhlIvdOxf1am7ixiVQnGqQhkHUnS7SriJmafo7TO9mKhrdDuhNqXgirwC13wxCAGrSlDGNUzITCeyyLSrS6pH8L+4VsS5p0d2dx+9gSDlL0iNiIB3CxqLg=
   matrix:
-  - OPENRESTY_VERSION=1.11.2.2 LUAROCKS_VERSION=2.3.0 S2I_VERSION=1.1.1-724c0dd
+  - OPENRESTY_VERSION=1.11.2.2-1 LUAROCKS_VERSION=2.3.0 S2I_VERSION=1.1.4-870b273
 before_install:
 - travis/install-openresty.sh
 - travis/install-luarocks.sh

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 ### Changed
 - Cache all calls to `os.getenv` via custom module [PR #231](https://github.com/3scale/apicast/pull/231)
+- Bump s2i-openresty to 1.11.2.2-1 [PR #239](https://github.com/3scale/apicast/pull/239)
 
 ### Fixed
 - [OAuth] Return correct state value back to client

Makefile

@@ -9,7 +9,7 @@ SHELL=/bin/bash -o pipefail
 SEPARATOR="\n=============================================\n"
 
 IMAGE_NAME ?= apicast-test
-OPENRESTY_VERSION ?= 1.11.2.2
+OPENRESTY_VERSION ?= 1.11.2.2-1
 BUILDER_IMAGE ?= quay.io/3scale/s2i-openresty-centos7:$(OPENRESTY_VERSION)
 RUNTIME_IMAGE ?= $(BUILDER_IMAGE)-runtime
 

travis/install-openresty.sh

@@ -2,6 +2,7 @@
 set -eux
 
 PREFIX=${1:-$HOME/openresty}
+OPENRESTY_VERSION=$(echo "${OPENRESTY_VERSION}" | cut -f1 -d-)
 OPENRESTY_ARCHIVE="openresty-${OPENRESTY_VERSION}"
 OPENRESTY="${PREFIX}/bin/openresty"
 

travis/install-s2i.sh

@@ -5,13 +5,13 @@ PREFIX=${1:-$HOME/bin}
 
 os=$(uname -s | tr '[:upper:]' '[:lower:]')
 arch=$(uname -m | sed 's/x86_/amd/' | tr -d 'i' | sed 's/686/386/')
-version=$(echo ${S2I_VERSION} | cut -f1 -d-)
-sha=$(echo ${S2I_VERSION} | cut -f2 -d-)
+version=$(echo "${S2I_VERSION}" | cut -f1 -d-)
+sha=$(echo "${S2I_VERSION}" | cut -f2 -d-)
 
 if [ ! -f "${PREFIX}/s2i" ]; then
   cd /tmp/
   mkdir -p "${PREFIX}"
-  wget -T 60 -q -c https://github.com/openshift/source-to-image/releases/download/v${version}/source-to-image-v${version}-${sha}-${os}-${arch}.tar.gz -O source-to-image.tar.gz
+  wget -T 60 -c "https://github.com/openshift/source-to-image/releases/download/v${version}/source-to-image-${version}-${sha}-${os}-${arch}.tar.gz" -O source-to-image.tar.gz
   tar -xzf source-to-image.tar.gz -C "${PREFIX}/"
   rm -rf source-to-image.tar.gz
 else