Merge pull request #13 from cloud66-oss/feature/passenger-update

Feature/passenger update

Dockerfile

@@ -38,7 +38,7 @@ ARG UPLOAD_PROGRESS_MODULE_VERSION=0.9.2
 ARG UPSTREAM_FAIR_MODULE_VERSION=0.1.3
 ARG HTTP_SUBSTITUTIONS_FILTER_MODULE_VERSION=0.6.4
 ARG HTTP_GEOIP2_MODULE_VERSION=3.3
-ARG NGX_MRUBY_VERSION=2.2.4
+ARG NGX_MRUBY_VERSION=2.5.0
 
 # NOTE: these are debian package versions derived from the above (for packages that will be publicly published)
 # NOTE: tried using debian epoch BUT it looks like there's a bug in apt where if the package name contains a ':' character, it doesn't install the package (says nothing to be done)

bulk-generate.rb

@@ -3,7 +3,7 @@
 RELEASE_VERSION = ARGV[0]
 OS_VERSIONS = %w(18.04 20.04 22.04)
 NGINX_VERSIONS = %w(1.22.1)
-PASSENGER_VERSIONS = %w(6.0.15)
+PASSENGER_VERSIONS = %w(6.0.20)
 
 raise "Must provide release number as first argument" if RELEASE_VERSION.nil?
 

compile_nginx.sh

@@ -48,4 +48,4 @@ tag="cloud66-nginx:ubuntu-$1-nginx-$2-passenger-$3-release-$4"
 # remove previous build
 docker rmi --force $tag >/dev/null 2>&1
 # build new version
-docker build --rm --build-arg OPERATING_SYSTEM_VERSION=$1 --build-arg OPERATING_SYSTEM_CODENAME=$OPERATING_SYSTEM_CODENAME --build-arg NGINX_VERSION=$2 --build-arg PASSENGER_VERSION=$3 --build-arg RELEASE_VERSION=$4 --build-arg INCLUDE_PASSENGER_ENTERPRISE=$INCLUDE_PASSENGER_ENTERPRISE --build-arg OPENSSL_VERSION=$OPENSSL_VERSION --tag $tag . >$build_log_file 2>&1
+docker build --rm --build-arg OPERATING_SYSTEM_VERSION=$1 --build-arg OPERATING_SYSTEM_CODENAME=$OPERATING_SYSTEM_CODENAME --build-arg NGINX_VERSION=$2 --build-arg PASSENGER_VERSION=$3 --build-arg RELEASE_VERSION=$4 --build-arg INCLUDE_PASSENGER_ENTERPRISE=$INCLUDE_PASSENGER_ENTERPRISE --build-arg OPENSSL_VERSION=$OPENSSL_VERSION --tag $tag --platform "linux/amd64" . >$build_log_file 2>&1