diff --git a/deploy/nginx.conf.jinja2 b/deploy/nginx.conf.jinja2 index c762a077b3..9f8aed7e7a 100644 --- a/deploy/nginx.conf.jinja2 +++ b/deploy/nginx.conf.jinja2 @@ -82,6 +82,7 @@ http { proxy_pass http://studio; proxy_redirect off; proxy_set_header Host $host; + proxy_read_timeout 100s; } location /content/ { diff --git a/k8s/images/nginx/Dockerfile b/k8s/images/nginx/Dockerfile index 378d964e19..d0f41afaa5 100644 --- a/k8s/images/nginx/Dockerfile +++ b/k8s/images/nginx/Dockerfile @@ -1,17 +1,18 @@ FROM byrnedo/alpine-curl # download all extra deps we need for the production container - # templating executable -RUN curl -L "https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_$(uname -sm|tr \ _).tgz" \ | tar -zxC /usr/bin +COPY /k8s/images/nginx/download_sigil.sh /tmp/download_sigil.sh +RUN chmod +x /tmp/download_sigil.sh +RUN /tmp/download_sigil.sh -FROM nginx:1.11 +FROM nginx:1.25 RUN rm /etc/nginx/conf.d/* # if there's stuff here, nginx won't read sites-enabled ADD deploy/nginx.conf.jinja2 /etc/nginx/nginx.conf.jinja2 ADD k8s/images/nginx/entrypoint.sh /usr/bin # install the templating binary -COPY --from=0 /usr/bin/sigil /usr/bin +COPY --from=0 /tmp/sigil /usr/bin/ -CMD entrypoint.sh \ No newline at end of file +CMD entrypoint.sh diff --git a/k8s/images/nginx/download_sigil.sh b/k8s/images/nginx/download_sigil.sh new file mode 100755 index 0000000000..d5b8e05e90 --- /dev/null +++ b/k8s/images/nginx/download_sigil.sh @@ -0,0 +1,8 @@ +#!/bin/sh +export SIGIL_VERSION=0.10.1 +export OS=`sh -c "uname -s | tr '[:upper:]' '[:lower:]'"` +export ARCH=`sh -c "uname -m | tr '[:upper:]' '[:lower:]' | sed 's/aarch64/arm64/'"` + + +curl -L "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/gliderlabs-sigil_${SIGIL_VERSION}_${OS}_${ARCH}.tgz" | tar -zxC /tmp +mv /tmp/gliderlabs-sigil-${ARCH} /tmp/sigil