Skip to content

Commit 3f62a61

Browse files
committed
update to 20.04 focal
1 parent 52353a6 commit 3f62a61

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
FROM ubuntu:18.04 AS buildstep
1+
FROM ubuntu:20.04 AS buildstep
22
ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
33
NGINX_DEVEL_KIT_VERSION=0.3.0 NGINX_SET_MISC_MODULE_VERSION=0.32 \
4-
NGINX_VERSION=1.16.1
4+
NGINX_VERSION=1.18.0
55
ADD ./build/ /tmp/
66
RUN bash /tmp/ubuntu.sh
77

88

9-
FROM ubuntu:18.04
9+
FROM ubuntu:20.04
1010
LABEL maintainer="noogen <[email protected]>"
1111
ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
12-
NGINX_VERSION=_1.16.1-1~bionic_amd64.deb \
12+
NGINX_VERSION=_1.18.0-1~focal_amd64.deb \
1313
NGINX_DEBUG=-dbg${NGINX_VERSION}
1414

1515
COPY --from=buildstep /usr/src/nginx/nginx${NGINX_VERSION} /tmp
@@ -25,8 +25,8 @@ RUN cd /tmp \
2525
&& touch /var/log/cron.log \
2626
&& curl -s https://nginx.org/keys/nginx_signing.key | apt-key add - \
2727
&& cp /etc/apt/sources.list /etc/apt/sources.list.bak \
28-
&& echo "deb http://nginx.org/packages/ubuntu/ bionic nginx" | tee -a /etc/apt/sources.list \
29-
&& echo "deb-src http://nginx.org/packages/ubuntu/ bionic nginx" | tee -a /etc/apt/sources.list \
28+
&& echo "deb http://nginx.org/packages/ubuntu/ focal nginx" | tee -a /etc/apt/sources.list \
29+
&& echo "deb-src http://nginx.org/packages/ubuntu/ focal nginx" | tee -a /etc/apt/sources.list \
3030
&& apt-get update -y \
3131
&& dpkg -i nginx${NGINX_VERSION} \
3232
&& apt-get install --no-install-recommends --no-install-suggests -y nginx-module-njs gettext-base \

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,6 @@ And if that doesn't work, you can always use your custom nginx config by passing
116116
117117
# Point of Interest
118118
* [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.
119-
> 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.
119+
> 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.
120120
121121
# MIT

build/ubuntu.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ rm ngx-misc.tar.gz
2222

2323
curl -s https://nginx.org/keys/nginx_signing.key | apt-key add -
2424
cp /etc/apt/sources.list /etc/apt/sources.list.bak
25-
echo "deb http://nginx.org/packages/ubuntu/ bionic nginx" | tee -a /etc/apt/sources.list
26-
echo "deb-src http://nginx.org/packages/ubuntu/ bionic nginx" | tee -a /etc/apt/sources.list
25+
echo "deb http://nginx.org/packages/ubuntu/ focal nginx" | tee -a /etc/apt/sources.list
26+
echo "deb-src http://nginx.org/packages/ubuntu/ focal nginx" | tee -a /etc/apt/sources.list
2727

2828
apt-get update && apt-get upgrade -y --no-install-recommends --no-install-suggests
2929

0 commit comments

Comments
 (0)