updated versions (in preparation for v1.3.1)

Dockerfile

@@ -1,38 +1,38 @@
 # NOTE: these MUST be provided
-ARG OPERATING_SYSTEM_VERSION=18.04
-ARG OPERATING_SYSTEM_CODENAME=bionic
-ARG INCLUDE_PASSENGER_ENTERPRISE=false
+ARG OPERATING_SYSTEM_VERSION=*passed-in*
+ARG OPERATING_SYSTEM_CODENAME=*passed-in*
+ARG INCLUDE_PASSENGER_ENTERPRISE=*passed-in*
 
 # NOTE: these are recommended to be provided
-ARG NGINX_VERSION=1.20.1
-ARG PASSENGER_VERSION=6.0.9
-ARG RELEASE_VERSION=1.3.0
+ARG NGINX_VERSION=*passed-in*
+ARG PASSENGER_VERSION=*passed-in*
+ARG RELEASE_VERSION=*passed-in*
 
 # NOTE: these are updated as required (build dependencies)
-ARG AUTOMAKE_VERSION=1.16.1
+ARG AUTOMAKE_VERSION=1.16.4
 ARG OPENSSL_VERSION=1.1.1l
-ARG PCRE_VERSION=8.44
+ARG PCRE_VERSION=8.45
 ARG ZLIB_VERSION=1.2.11
-ARG LIBGD_VERSION=2.3.2
-ARG MODSECURITY_VERSION=3.0.4
+ARG LIBGD_VERSION=2.3.3
+ARG MODSECURITY_VERSION=3.0.5
 ARG LUAJIT2_VERSION=2.1.0-beta3
 ARG LUAJIT2_PACKAGE_VERSION=2.1-20210510
 ARG LUAJIT2_SHORT_VERSION=2.1
-ARG LUA_RESTY_CORE_VERSION=0.1.21
-ARG LUA_RESTY_LRUCACHE_VERSION=0.10
+ARG LUA_RESTY_CORE_VERSION=0.1.22
+ARG LUA_RESTY_LRUCACHE_VERSION=0.11
 ARG LIBMAXMINDDB_VERSION=1.6.0
 
 # NOTE: these are updated as required (NGINX modules)
-ARG MODSECURITY_MODULE_VERSION=1.0.1
+ARG MODSECURITY_MODULE_VERSION=1.0.2
 ARG HEADERS_MORE_MODULE_VERSION=0.33
-ARG HTTP_AUTH_PAM_MODULE_VERSION=1.5.2
+ARG HTTP_AUTH_PAM_MODULE_VERSION=1.5.3
 ARG CACHE_PURGE_MODULE_VERSION=2.4.3
 ARG DAV_EXT_MODULE_VERSION=3.0.0
 ARG DEVEL_KIT_MODULE_VERSION=0.3.1
 ARG ECHO_MODULE_VERSION=0.62
 ARG FANCYINDEX_MODULE_VERSION=0.5.1
-ARG NCHAN_MODULE_VERSION=1.2.8
-ARG LUA_MODULE_VERSION=0.10.19
+ARG NCHAN_MODULE_VERSION=1.2.10
+ARG LUA_MODULE_VERSION=0.10.20
 ARG RTMP_MODULE_VERSION=1.2.2
 ARG UPLOAD_PROGRESS_MODULE_VERSION=0.9.2
 ARG UPSTREAM_FAIR_MODULE_VERSION=0.1.3

README.md

@@ -9,9 +9,9 @@ It is used by Cloud 66 to compile the default NGINX + Passenger installation for
 This project uses Docker to compile NGINX. You must have Docker installed on your host machine for the scripts to work.
 
 ## Compilation
-You can compile NGINX for a specific combination of Ubuntu + NGINX + Passenger + release versions. The release version is used to cover dependencies that are not covered by the other versions, e.g. build dependency/NGINX module update. For Ubuntu 18.04, NGINX 1.20.1, Passenger 6.0.9 and release 1.0.0, this is done by running the following:
+You can compile NGINX for a specific combination of Ubuntu + NGINX + Passenger + release versions. The release version is used to cover dependencies that are not covered by the other versions, e.g. build dependency/NGINX module update. For Ubuntu 18.04, NGINX 1.20.1, Passenger 6.0.10 and release 1.0.0, this is done by running the following:
 ```bash
-./compile_nginx.sh 18.04 1.20.1 6.0.9 1.0.0
+./compile_nginx.sh 18.04 1.20.1 6.0.10 1.0.0
 ```
 
 This will result in a Docker image which will contain NGINX + Passenger in separate tarballs.
@@ -22,7 +22,7 @@ You can optionally compile Passenger Enterprise. To do this, you must have both
 ## Extraction
 To extract the tarballs from the Docker image, you can run the following (for your combination of Ubuntu + NGINX + Passenger + release versions):
 ```
-./extract_nginx.sh 18.04 1.20.1 6.0.9 1.0.0
+./extract_nginx.sh 18.04 1.20.1 6.0.10 1.0.0
 ```
 
 This will place the resulting tarballs in the `output` directory. For the previous extraction example, you will find one file under `output/binaries`: `ubuntu-18.04-nginx-1.0.0.tar.gz`.
@@ -39,7 +39,7 @@ $ find /usr/local/debs/
 /usr/local/debs/
 /usr/local/debs/ubuntu-18.04-nginx-1.0.0
 /usr/local/debs/ubuntu-18.04-nginx-1.0.0/passenger-module
-/usr/local/debs/ubuntu-18.04-nginx-1.0.0/passenger-module/nginx-module-http-passenger_6.0.9+nginx1.20.1-1.0.0~bionic1_amd64.deb
+/usr/local/debs/ubuntu-18.04-nginx-1.0.0/passenger-module/nginx-module-http-passenger_6.0.10+nginx1.20.1-1.0.0~bionic1_amd64.deb
 /usr/local/debs/ubuntu-18.04-nginx-1.0.0/nginx
 /usr/local/debs/ubuntu-18.04-nginx-1.0.0/nginx/nginx_1.20.1-1.0.0~bionic1_amd64.deb
 /usr/local/debs/ubuntu-18.04-nginx-1.0.0/prerequisites
@@ -48,7 +48,7 @@ $ find /usr/local/debs/
 /usr/local/debs/ubuntu-18.04-nginx-1.0.0/prerequisites/openresty-luajit_2.1-20210510-1.0.0~bionic1_amd64.deb
 /usr/local/debs/ubuntu-18.04-nginx-1.0.0/prerequisites/openresty-lua-core_0.1.21-1.0.0~bionic1_amd64.deb
 /usr/local/debs/ubuntu-18.04-nginx-1.0.0/passenger
-/usr/local/debs/ubuntu-18.04-nginx-1.0.0/passenger/passenger_6.0.9-1.0.0~bionic1_amd64.deb
+/usr/local/debs/ubuntu-18.04-nginx-1.0.0/passenger/passenger_6.0.10-1.0.0~bionic1_amd64.deb
 ```
 
 You can then install NGINX with the following:

bulk-generate.rb

@@ -2,9 +2,9 @@
 require 'date'
 RELEASE_VERSION = ARGV[0]
 #OS_VERSIONS = %w(18.04)
-OS_VERSIONS = %w(20.04)
+OS_VERSIONS = %w(18.04 20.04)
 NGINX_VERSIONS = %w(1.20.1)
-PASSENGER_VERSIONS = %w(6.0.9)
+PASSENGER_VERSIONS = %w(6.0.10)
 
 raise "Must provide release number as first argument" if RELEASE_VERSION.nil?
 

compile_nginx.sh

@@ -5,11 +5,11 @@ if [[ -z "$1" ]] || [[ -z "$2" ]] || [[ -z "$3" ]]; then
     echo "FATAL: Expected ARGS:"
     echo "1. os-version: 18.04"
     echo "2. nginx-version: ie. 1.18.0"
-    echo "3. passenger-version: 6.0.9"
+    echo "3. passenger-version: 6.0.10"
     echo "4. release-version: 1.0.0"
     echo ""
     echo "Usage Examples:"
-    echo "./compile_nginx.sh 18.04 1.18.0 6.0.9 1.0.0"
+    echo "./compile_nginx.sh 18.04 1.18.0 6.0.10 1.0.0"
     exit 22
 fi
 

extract_nginx.sh

@@ -5,11 +5,11 @@ if [[ -z "$1" ]] || [[ -z "$2" ]] || [[ -z "$3" ]]; then
     echo "FATAL: Expected ARGS:"
     echo "1. os-version: 18.04"
     echo "2. nginx-version: ie. 1.18.0"
-    echo "3. passenger-version: 6.0.9"
+    echo "3. passenger-version: 6.0.10"
     echo "4. release-version: 1.0.0"
     echo ""
     echo "Usage Examples:"
-    echo "./extract_nginx.sh 18.04 1.18.0 6.0.9 1.0.0"
+    echo "./extract_nginx.sh 18.04 1.18.0 6.0.10 1.0.0"
     exit 22
 fi