Skip to content

Commit

Permalink
update to 20.04 focal
Browse files Browse the repository at this point in the history
  • Loading branch information
noogen committed May 18, 2020
1 parent 52353a6 commit 3f62a61
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
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
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions build/ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 3f62a61

Please sign in to comment.