diff --git a/latest-versions.sh b/latest-versions.sh index 1a58cbe..a29342f 100755 --- a/latest-versions.sh +++ b/latest-versions.sh @@ -45,15 +45,25 @@ get_latest() { dir="unixbench" elif [[ "$dir" == "Tautulli" ]]; then dir="plexpy" - elif [[ "$dir" == "nginx" ]]; then - dir="telize" elif [[ "$dir" == "zookeeper" ]]; then dir="zookeeper/3.5" elif [[ "$dir" == "oauth2_proxy" ]]; then dir="oauth2-proxy" fi - local current=$(cat "${dir}/Dockerfile" | grep -m 1 VERSION | awk '{print $(NF)}') + # Change to upper case for grep + local udir=$(echo $dir | awk '{print toupper($0)}') + # Replace dashes (-) with underscores (_) + udir=${udir//-/_} + + local current + if [[ ! -d "$dir" ]]; then + # If the directory does not exist, then grep all for it + current=$(grep -m 1 "${udir}_VERSION" **/Dockerfile | awk '{print $(NF)}') + else + current=$(cat "${dir}/Dockerfile" | grep -m 1 "${udir}_VERSION" | awk '{print $(NF)}') + fi + compare "$name" "$dir" "$tag" "$current" "https://github.com/${repo}/releases" } @@ -93,6 +103,7 @@ kubernetes-incubator/cri-o curl/curl google/guetzli irssi/irssi +cryptodotis/irssi-otr keepassxreboot/keepassxc zyedidia/micro bitly/oauth2_proxy @@ -102,6 +113,11 @@ ricochet-im/ricochet reverse-shell/routersploit tarsnap/tarsnap nginx/nginx +simplresty/ngx_devel_kit +openresty/lua-nginx-module +leev/ngx_http_geoip2_module +maxmind/libmaxminddb +fcambus/telize hashicorp/terraform kdlucas/byte-unixbench mitchellh/vagrant diff --git a/oauth2-proxy/Dockerfile b/oauth2-proxy/Dockerfile index 01e2771..b547f5c 100644 --- a/oauth2-proxy/Dockerfile +++ b/oauth2-proxy/Dockerfile @@ -7,7 +7,7 @@ ENV GOPATH /go RUN apk --no-cache add \ ca-certificates -ENV OAUTH2_VERSION v2.2 +ENV OAUTH2_PROXY_VERSION v2.2 RUN buildDeps=' \ go \ diff --git a/telize/Dockerfile b/telize/Dockerfile index 792c043..0fb357d 100644 --- a/telize/Dockerfile +++ b/telize/Dockerfile @@ -4,13 +4,13 @@ RUN apk add --no-cache \ lua5.1-cjson \ luajit -ENV NGINX_VERSION 1.12.2 +ENV NGINX_VERSION 1.13.10 # https://github.com/simplresty/ngx_devel_kit/releases -ENV DEVELKIT_MODULE_VERSION v0.3.1rc1 +ENV NGX_DEVEL_KIT_VERSION v0.3.1rc1 # https://github.com/openresty/lua-nginx-module/releases -ENV LUA_MODULE_VERSION v0.10.12rc2 +ENV LUA_NGINX_MODULE_VERSION v0.10.12rc2 # https://github.com/leev/ngx_http_geoip2_module/releases -ENV GEOIP2_MODULE_VERSION 2.0 +ENV NGX_HTTP_GEOIP2_MODULE_VERSION 2.0 # https://github.com/maxmind/libmaxminddb/releases ENV LIBMAXMINDDB_VERSION 1.3.2 @@ -89,9 +89,9 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ luajit-dev \ musl-utils \ file \ - && git clone --depth 1 --branch "${DEVELKIT_MODULE_VERSION}" https://github.com/simplresty/ngx_devel_kit.git /usr/src/ngx_devel_kit \ - && git clone --depth 1 --branch "${LUA_MODULE_VERSION}" https://github.com/openresty/lua-nginx-module.git /usr/src/lua-nginx-module \ - && git clone --depth 1 --branch "${GEOIP2_MODULE_VERSION}" https://github.com/leev/ngx_http_geoip2_module.git /usr/src/ngx_http_geoip2_module \ + && git clone --depth 1 --branch "${NGX_DEVEL_KIT_VERSION}" https://github.com/simplresty/ngx_devel_kit.git /usr/src/ngx_devel_kit \ + && git clone --depth 1 --branch "${LUA_NGINX_MODULE_VERSION}" https://github.com/openresty/lua-nginx-module.git /usr/src/lua-nginx-module \ + && git clone --depth 1 --branch "${NGX_HTTP_GEOIP2_MODULE_VERSION}" https://github.com/leev/ngx_http_geoip2_module.git /usr/src/ngx_http_geoip2_module \ && mkdir -p /usr/src/libmaxminddb \ && curl -sSL "https://github.com/maxmind/libmaxminddb/releases/download/${LIBMAXMINDDB_VERSION}/libmaxminddb-${LIBMAXMINDDB_VERSION}.tar.gz" | tar -xzf - --strip-components 1 -C /usr/src/libmaxminddb \ && ( \