fix telize

Signed-off-by: Jess Frazelle <jess@oxide.computer>
This commit is contained in:
Jess Frazelle 2020-05-19 15:26:18 -07:00
parent 3d5bb0fdd3
commit bbbe8bca39
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
5 changed files with 24 additions and 4 deletions

View File

@ -1,7 +1,7 @@
FROM python:2-alpine FROM python:2-alpine
ENV PATH $PATH:/usr/src/google-cloud-sdk/bin ENV PATH $PATH:/usr/src/google-cloud-sdk/bin
ENV CLOUD_SDK_DOCKER_VERSION 292.0.0 ENV CLOUD_SDK_DOCKER_VERSION 293.0.0
RUN set -x \ RUN set -x \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \

View File

@ -147,6 +147,8 @@ projects=(
openresty/lua-nginx-module openresty/lua-nginx-module
leev/ngx_http_geoip2_module leev/ngx_http_geoip2_module
maxmind/libmaxminddb maxmind/libmaxminddb
openresty/lua-resty-core
openresty/lua-resty-lrucache
hashicorp/terraform hashicorp/terraform
kdlucas/byte-unixbench kdlucas/byte-unixbench
mitchellh/vagrant mitchellh/vagrant

View File

@ -12,7 +12,7 @@ RUN apk add --no-cache \
make \ make \
zip zip
ENV PACKER_VERSION v1.5.5 ENV PACKER_VERSION v1.5.3
RUN go get github.com/hashicorp/packer RUN go get github.com/hashicorp/packer

View File

@ -15,7 +15,7 @@ RUN apk add --no-cache \
py-pip py-pip
# Get the source # Get the source
ENV PLEXPY_VERSION v2.2.3 ENV PLEXPY_VERSION v2.2.4
RUN git clone https://github.com/Tautulli/Tautulli.git /opt/plexpy \ RUN git clone https://github.com/Tautulli/Tautulli.git /opt/plexpy \
&& ( \ && ( \
cd /opt/plexpy \ cd /opt/plexpy \

View File

@ -13,6 +13,10 @@ ENV LUA_NGINX_MODULE_VERSION v0.10.16rc5
ENV NGX_HTTP_GEOIP2_MODULE_VERSION 3.3 ENV NGX_HTTP_GEOIP2_MODULE_VERSION 3.3
# https://github.com/maxmind/libmaxminddb/releases # https://github.com/maxmind/libmaxminddb/releases
ENV LIBMAXMINDDB_VERSION 1.4.2 ENV LIBMAXMINDDB_VERSION 1.4.2
# https://github.com/openresty/lua-resty-core/releases
ENV LUA_RESTY_CORE_VERSION v0.1.18rc4
# https://github.com/openresty/lua-resty-lrucache/releases
ENV LUA_RESTY_LRUCACHE_VERSION v0.10rc1
# Tell nginx's build system where to find LuaJIT 2.1: # Tell nginx's build system where to find LuaJIT 2.1:
ENV LUAJIT_LIB=/usr/lib/ ENV LUAJIT_LIB=/usr/lib/
@ -92,6 +96,18 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& 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 "${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 "${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 \ && 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 \
&& git clone --depth 1 --branch "${LUA_RESTY_CORE_VERSION}" https://github.com/openresty/lua-resty-core.git /usr/src/lua-resty-core \
&& ( \
cd /usr/src/lua-resty-core \
&& make \
&& make install \
) \
&& git clone --depth 1 --branch "${LUA_RESTY_LRUCACHE_VERSION}" https://github.com/openresty/lua-resty-lrucache.git /usr/src/lua-resty-lrucache \
&& ( \
cd /usr/src/lua-resty-lrucache \
&& make \
&& make install \
) \
&& mkdir -p /usr/src/libmaxminddb \ && 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 \ && 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 \
&& ( \ && ( \
@ -147,7 +163,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& strip /usr/sbin/nginx* \ && strip /usr/sbin/nginx* \
&& strip /usr/lib/nginx/modules/*.so \ && strip /usr/lib/nginx/modules/*.so \
) \ ) \
&& rm -rf /usr/src/nginx-$NGINX_VERSION /usr/src/ngx_devel_kit /usr/src/lua-nginx-module /usr/src/ngx_http_geoip2_module /usr/src/libmaxminddb \ && rm -rf /usr/src/nginx-$NGINX_VERSION /usr/src/ngx_devel_kit /usr/src/lua-nginx-module /usr/src/ngx_http_geoip2_module /usr/src/libmaxminddb /usr/src/lua-resty-core /usr/src/lua-resty-lrucache \
\ \
# Bring in gettext so we can get `envsubst`, then throw # Bring in gettext so we can get `envsubst`, then throw
# the rest away. To do this, we need to install `gettext` # the rest away. To do this, we need to install `gettext`
@ -200,4 +216,6 @@ COPY nginx.conf /etc/nginx/nginx.conf
COPY mime.types /etc/nginx/mime.types COPY mime.types /etc/nginx/mime.types
COPY telize.conf /etc/nginx/conf.d/telize.conf COPY telize.conf /etc/nginx/conf.d/telize.conf
WORKDIR /usr/local/lib/lua
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]