Skip to content

Commit

Permalink
Merge branch 'igornovg/nginx-upgrade-1.25' into 'master'
Browse files Browse the repository at this point in the history
feat(BOUN-1002): bump nginx to 1.25.3 in the base image

After base image is merged it'd be good to do some config updates due to deprecations:

```plaintext
# nginx -t
nginx: [warn] the "listen ... http2" directive is deprecated, use the "http2" directive instead in /etc/nginx/conf.d/000-nginx-global.conf:144
nginx: [warn] the "listen ... http2" directive is deprecated, use the "http2" directive instead in /etc/nginx/conf.d/000-nginx-global.conf:145
nginx: [warn] the "listen ... http2" directive is deprecated, use the "http2" directive instead in /etc/nginx/conf.d/001-rosetta-nginx.conf:2
nginx: [warn] the "listen ... http2" directive is deprecated, use the "http2" directive instead in /etc/nginx/conf.d/001-rosetta-nginx.conf:3
nginx: [warn] the "listen ... http2" directive is deprecated, use the "http2" directive instead in /var/opt/nginx/domains.conf:2
``` 

See merge request dfinity-lab/public/ic!17094
  • Loading branch information
blind-oracle committed Jan 11, 2024
2 parents e69bcc7 + 5627103 commit e96bc21
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions ic-os/boundary-guestos/rootfs/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ RUN \
https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/${NGX_HTTP_GEOIP2_MODULE_TAG}.tar.gz \
| tar -xzf -

ARG NGINX_VERSION=1.24.0
ARG NGINX_VERSION=1.25.3
RUN \
curl -sLv \
http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \
https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \
| tar -xzf -

WORKDIR /nginx-${NGINX_VERSION}
Expand Down Expand Up @@ -161,8 +161,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN apt-get -y update && apt-get -y upgrade && apt-get -y --no-install-recommends install gnupg
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62

RUN echo "deb http://nginx.org/packages/ubuntu/ focal nginx" >> /etc/apt/sources.list.d/nginx.list &&\
echo "deb-src http://nginx.org/packages/ubuntu/ focal nginx" >> /etc/apt/sources.list.d/nginx.list
RUN echo "deb http://nginx.org/packages/mainline/ubuntu/ focal nginx" >> /etc/apt/sources.list.d/nginx.list &&\
echo "deb-src http://nginx.org/packages/mainline/ubuntu/ focal nginx" >> /etc/apt/sources.list.d/nginx.list

# GeoIP repository
RUN \
Expand Down Expand Up @@ -205,8 +205,8 @@ RUN \
net-tools \
netbase \
nftables \
nginx-module-njs=1.24.0+0.8.2-1~focal \
nginx=1.24.0-1~focal \
nginx-module-njs=1.25.3+0.8.2-1~focal \
nginx=1.25.3-1~focal \
opensc \
openssh-client openssh-server \
parted \
Expand Down

0 comments on commit e96bc21

Please sign in to comment.