From 3f62a6106f02235e7e673a07433205632e83da15 Mon Sep 17 00:00:00 2001 From: noogen Date: Mon, 18 May 2020 08:18:02 -0500 Subject: [PATCH] update to 20.04 focal --- Dockerfile | 12 ++++++------ README.md | 2 +- build/ubuntu.sh | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 014e966..af8b02e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM ubuntu:18.04 AS buildstep +FROM ubuntu:20.04 AS buildstep ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \ NGINX_DEVEL_KIT_VERSION=0.3.0 NGINX_SET_MISC_MODULE_VERSION=0.32 \ - NGINX_VERSION=1.16.1 + NGINX_VERSION=1.18.0 ADD ./build/ /tmp/ RUN bash /tmp/ubuntu.sh -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL maintainer="noogen " ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \ - NGINX_VERSION=_1.16.1-1~bionic_amd64.deb \ + NGINX_VERSION=_1.18.0-1~focal_amd64.deb \ NGINX_DEBUG=-dbg${NGINX_VERSION} COPY --from=buildstep /usr/src/nginx/nginx${NGINX_VERSION} /tmp @@ -25,8 +25,8 @@ RUN cd /tmp \ && touch /var/log/cron.log \ && curl -s https://nginx.org/keys/nginx_signing.key | apt-key add - \ && cp /etc/apt/sources.list /etc/apt/sources.list.bak \ - && echo "deb http://nginx.org/packages/ubuntu/ bionic nginx" | tee -a /etc/apt/sources.list \ - && echo "deb-src http://nginx.org/packages/ubuntu/ bionic nginx" | tee -a /etc/apt/sources.list \ + && echo "deb http://nginx.org/packages/ubuntu/ focal nginx" | tee -a /etc/apt/sources.list \ + && echo "deb-src http://nginx.org/packages/ubuntu/ focal nginx" | tee -a /etc/apt/sources.list \ && apt-get update -y \ && dpkg -i nginx${NGINX_VERSION} \ && apt-get install --no-install-recommends --no-install-suggests -y nginx-module-njs gettext-base \ diff --git a/README.md b/README.md index 4c82924..e5b1584 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,6 @@ And if that doesn't work, you can always use your custom nginx config by passing # Point of Interest * [images.weserv.nl](https://github.com/weserv/images) is another great project to look at if you need additional features with image resizing. The original purpose of this library (nginx-image-proxy) is to provide high performance and low resource utilization image private microservice. We searched high and low but did not find a good solution. At that time, we saw great potential with images.weserv.nl, but was held back because it was using php. Since July 2018, it was rewritten with lua and direct c binding; as a result, it has became the next best solution and continue to improve. The authors also generiously provide free endpoint for public use. This help prove their implementation to be well battle-tested for use in any production environment. -> Update, as of September 2019, images.weserv.nl was rewritten again as C++ so it has now became the better/best choice. We are now sun-setting this project, only maintenance and security support - no new feature, for the future date of December 2021 or 2 years from December 2020. +> Update, as of September 2019, images.weserv.nl was rewritten again as C++ so it has now became the better/best choice. We are now sun-setting this project, only maintenance and security support - no new feature, for the future date of December 2021 or 2 years from December 2019. # MIT diff --git a/build/ubuntu.sh b/build/ubuntu.sh index 12e68e6..c877c5c 100644 --- a/build/ubuntu.sh +++ b/build/ubuntu.sh @@ -22,8 +22,8 @@ rm ngx-misc.tar.gz curl -s https://nginx.org/keys/nginx_signing.key | apt-key add - cp /etc/apt/sources.list /etc/apt/sources.list.bak -echo "deb http://nginx.org/packages/ubuntu/ bionic nginx" | tee -a /etc/apt/sources.list -echo "deb-src http://nginx.org/packages/ubuntu/ bionic nginx" | tee -a /etc/apt/sources.list +echo "deb http://nginx.org/packages/ubuntu/ focal nginx" | tee -a /etc/apt/sources.list +echo "deb-src http://nginx.org/packages/ubuntu/ focal nginx" | tee -a /etc/apt/sources.list apt-get update && apt-get upgrade -y --no-install-recommends --no-install-suggests