Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update openssl libs in UBI base image & update nginx version #1499

Merged
merged 2 commits into from
Apr 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.0-experimental
ARG NGINX_VERSION=1.19.8
ARG NGINX_VERSION=1.19.9
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, very easy change now

ARG BUILD_OS=debian

############################################# Base image for Debian #############################################
Expand Down Expand Up @@ -129,7 +129,8 @@ LABEL name="NGINX Ingress Controller" \

RUN set -x \
&& groupadd --system --gid 101 nginx \
&& useradd --system --gid nginx --no-create-home --home-dir /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx
&& useradd --system --gid nginx --no-create-home --home-dir /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
&& yum update -y openssl-libs


RUN mkdir licenses
Expand Down
8 changes: 4 additions & 4 deletions docs-web/technical-specifications.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We provide the following Docker images, which include NGINX/NGINX Plus bundled w

### Images with NGINX

All images include NGINX 1.19.8.
All images include NGINX 1.19.9.
The supported architecture is x86-64.

```eval_rst
Expand All @@ -26,15 +26,15 @@ The supported architecture is x86-64.
- Third-party modules
- DockerHub image
* - Debian-based image
- ``nginx:1.19.8``, which is based on ``debian:buster-slim``
- ``nginx:1.19.9``, which is based on ``debian:buster-slim``
-
- ``nginx/nginx-ingress:1.11.0``
* - Alpine-based image
- ``nginx:1.19.8-alpine``, which is based on ``alpine:3.13``
- ``nginx:1.19.9-alpine``, which is based on ``alpine:3.13``
-
- ``nginx/nginx-ingress:1.11.0-alpine``
* - Debian-based image with Opentracing
- ``nginx:1.19.8``, which is based on ``debian:buster-slim``
- ``nginx:1.19.9``, which is based on ``debian:buster-slim``
- OpenTracing API for C++ 1.5.1, NGINX plugin for OpenTracing, C++ OpenTracing binding for Jaeger 0.4.2
-
* - Ubi-based image
Expand Down