Skip to content

Commit

Permalink
Update component versions (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
DimitriosLisenko committed Aug 19, 2022
1 parent 09353ba commit 3ce0c1b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ 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.10
ARG NCHAN_MODULE_VERSION=1.3.1
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
ARG HTTP_SUBSTITUTIONS_FILTER_MODULE_VERSION=0.6.4
ARG HTTP_GEOIP2_MODULE_VERSION=3.3
ARG NGX_MRUBY_VERSION=2.2.3
ARG NGX_MRUBY_VERSION=2.2.4

# 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)
Expand Down Expand Up @@ -476,7 +476,7 @@ RUN wget https://github.com/matsumotory/ngx_mruby/archive/refs/tags/v${NGX_MRUBY
cd ngx_mruby-${NGX_MRUBY_VERSION} &&\
./configure --with-ngx-src-root=/usr/local/build/nginx-${NGINX_VERSION} --with-ngx-config-opt='${NGINX_CONFIGURE_OPTIONS_WITHOUT_MODULES' --with-openssl-src=/usr/local/build/openssl-${OPENSSL_VERSION} &&\
make build_mruby &&\
make generate_gems_config_dynamic
make generate_gems_config

# NOTE: original --with-cc-opt had -Wdate-time, but that throws an error for the NGINX rtmp module, so removing it: https://github.com/arut/nginx-rtmp-module/issues/1235
# NOTE: couldn't think of a way to substitute NGINX_CONFIGURE_OPTIONS_WITHOUT_MODULES without echoing it to a file - everything else I tried ended up removing some characters (e.g. quotes)
Expand Down Expand Up @@ -507,14 +507,14 @@ RUN cd nginx-${NGINX_VERSION} &&\
--with-stream_geoip_module \
--with-stream_ssl_module \
--with-stream_ssl_preread_module \
--add-dynamic-module=/usr/local/build/nchan-${NCHAN_MODULE_VERSION} \
--add-module=/usr/local/build/headers-more-nginx-module-${HEADERS_MORE_MODULE_VERSION} \
--add-module=/usr/local/build/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_VERSION} \
--add-module=/usr/local/build/ngx_cache_purge-${CACHE_PURGE_MODULE_VERSION} \
--add-module=/usr/local/build/nginx-dav-ext-module-${DAV_EXT_MODULE_VERSION} \
--add-module=/usr/local/build/ngx_devel_kit-${DEVEL_KIT_MODULE_VERSION} \
--add-module=/usr/local/build/echo-nginx-module-${ECHO_MODULE_VERSION} \
--add-module=/usr/local/build/ngx-fancyindex-${FANCYINDEX_MODULE_VERSION} \
--add-module=/usr/local/build/nchan-${NCHAN_MODULE_VERSION} \
--add-module=/usr/local/build/lua-nginx-module-${LUA_MODULE_VERSION} \
--add-module=/usr/local/build/nginx-rtmp-module-${RTMP_MODULE_VERSION} \
--add-module=/usr/local/build/nginx-upload-progress-module-${UPLOAD_PROGRESS_MODULE_VERSION} \
Expand Down
4 changes: 2 additions & 2 deletions bulk-generate.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
RELEASE_VERSION = ARGV[0]
#OS_VERSIONS = %w(18.04)
OS_VERSIONS = %w(18.04 20.04)
NGINX_VERSIONS = %w(1.20.1)
PASSENGER_VERSIONS = %w(6.0.10)
NGINX_VERSIONS = %w(1.22.0)
PASSENGER_VERSIONS = %w(6.0.14)

raise "Must provide release number as first argument" if RELEASE_VERSION.nil?

Expand Down

0 comments on commit 3ce0c1b

Please sign in to comment.