1.16.0-ol-7-r2 release

2026-03-14 06:48:11 +08:00 · 2019-05-02 15:58:37 +00:00
parent abe99df86c
commit b3cae7c100
6 changed files with 86 additions and 15 deletions
--- a/bitnami/nginx/1.16/ol-7/Dockerfile
+++ b/bitnami/nginx/1.16/ol-7/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/oraclelinux-extras-base:7-r267
+FROM bitnami/oraclelinux-extras-base:7-r269
 LABEL maintainer "Bitnami <containers@bitnami.com>"

 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
@@ -9,20 +9,26 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \

 # Install required system packages and dependencies
 RUN install_packages glibc keyutils-libs krb5-libs libcom_err libselinux nss-softokn-freebl openssl-libs pcre zlib
-RUN . ./libcomponent.sh && component_unpack "nginx" "1.16.0-0" --checksum de3f2e7f973f2d4a60069edfd3b71d7b106bbb54b347bcf6d2781a71a1b65aca
+RUN . ./libcomponent.sh && component_unpack "nginx" "1.16.0-2" --checksum d6d8dbf5f7dbfc5dccd6f34cf72f9011d4d219e144a5ed3b6042dc17f8d99d87
+RUN ln -sf /dev/stdout /opt/bitnami/nginx/logs/access.log
+RUN ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log
+RUN chmod -R g+rwX /opt/bitnami/nginx/conf

 COPY rootfs /
 RUN /postunpack.sh
-
 ENV BITNAMI_APP_NAME="nginx" \
-    BITNAMI_IMAGE_VERSION="1.16.0-ol-7-r1" \
+    BITNAMI_IMAGE_VERSION="1.16.0-ol-7-r2" \
    NAMI_PREFIX="/.nami" \
+    NGINX_ENABLE_CUSTOM_PORTS="no" \
+    NGINX_HTTPS_PORT_NUMBER="" \
+    NGINX_HTTP_PORT_NUMBER="" \
    PATH="/opt/bitnami/nginx/sbin:$PATH"

+VOLUME [ "/app", "/certs" ]
+
 EXPOSE 8080 8443
-VOLUME [ "/app" "/certs" ]
+
 WORKDIR /app
 USER 1001
-
 ENTRYPOINT [ "/entrypoint.sh" ]
 CMD [ "/run.sh" ]
--- a/bitnami/nginx/1.16/ol-7/docker-compose.yml
+++ b/bitnami/nginx/1.16/ol-7/docker-compose.yml
@@ -5,5 +5,3 @@ services:
    image: 'bitnami/nginx:1.16-ol-7'
    ports:
      - '80:8080'
-    environment:
-      - NGINX_HTTP_PORT_NUMBER=8080
--- a/bitnami/nginx/1.16/ol-7/rootfs/libnginx.sh
+++ b/bitnami/nginx/1.16/ol-7/rootfs/libnginx.sh
@@ -111,7 +111,7 @@ nginx_config_http_port() {
    local http_port=${1:-8080}
    debug "Configuring default HTTP port..."
    # TODO: find an appropriate NGINX parser to avoid 'sed calls'
-    sed -i -E "s/(listen\s+)[0-9]{1,5};/\1${http_port};/g" ${NGINX_CONFDIR}/nginx.conf
+    sed -i -E "s/(listen\s+)[0-9]{1,5};/\1${http_port};/g" "${NGINX_CONFDIR}/nginx.conf"
 }

 ########################
@@ -180,7 +180,7 @@ nginx_initialize() {
    else
        # The "user" directive makes sense only if the master process runs with super-user privileges
        # TODO: find an appropriate NGINX parser to avoid 'sed calls'
-        sed -i -E "s/(^user)/# \1/g" ${NGINX_CONFDIR}/nginx.conf
+        sed -i -E "s/(^user)/# \1/g" "${NGINX_CONFDIR}/nginx.conf"
    fi

    debug "Updating 'nginx.conf' based on user configuration..."
--- a/bitnami/nginx/1.16/ol-7/rootfs/nginx-inputs.json
+++ b/bitnami/nginx/1.16/ol-7/rootfs/nginx-inputs.json
@@ -0,0 +1,5 @@
+{
+  "enableCustomPorts": "{{$global.env.NGINX_ENABLE_CUSTOM_PORTS}}",
+  "httpPort": "{{$global.env.NGINX_HTTP_PORT_NUMBER}}",
+  "httpsPort": "{{$global.env.NGINX_HTTPS_PORT_NUMBER}}"
+}
--- a/bitnami/nginx/1.16/ol-7/rootfs/opt/bitnami/extra/nginx/templates/nginx.conf.tpl
+++ b/bitnami/nginx/1.16/ol-7/rootfs/opt/bitnami/extra/nginx/templates/nginx.conf.tpl
@@ -0,0 +1,64 @@
+# based on http://brainspl.at/nginx.conf.txt
+
+{{#if NGINX_DAEMON_USER}}{{#if NGINX_DAEMON_GROUP}}
+user {{NGINX_DAEMON_USER}} {{NGINX_DAEMON_GROUP}};
+{{/if}}{{/if}}
+
+worker_processes  auto;
+
+error_log  "{{NGINX_LOGDIR}}/error.log";
+pid        "{{NGINX_TMPDIR}}/nginx.pid";
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    add_header X-Frame-Options SAMEORIGIN;
+    client_body_temp_path  "{{NGINX_TMPDIR}}/client_body" 1 2;
+    proxy_temp_path "{{NGINX_TMPDIR}}/proxy" 1 2;
+    fastcgi_temp_path "{{NGINX_TMPDIR}}/fastcgi" 1 2;
+    scgi_temp_path "{{NGINX_TMPDIR}}/scgi" 1 2;
+    uwsgi_temp_path "{{NGINX_TMPDIR}}/uwsgi" 1 2;
+
+    log_format main '$remote_addr - $remote_user [$time_local] '
+                    '"$request" $status  $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  "{{NGINX_LOGDIR}}/access.log";
+
+    # no sendfile on OSX
+    sendfile        on;
+
+    tcp_nopush     on;
+    tcp_nodelay       off;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+    gzip on;
+    gzip_http_version 1.0;
+    gzip_comp_level 2;
+    gzip_proxied any;
+    gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+
+  include "{{NGINX_CONFDIR}}/vhosts/*.conf";
+
+  # HTTP Server
+  server {
+    # port to listen on. Can also be set to an IP:PORT
+    listen {{NGINX_HTTP_PORT_NUMBER}};
+
+    location /status {
+      stub_status on;
+      access_log   off;
+      allow 127.0.0.1;
+      deny all;
+    }
+  }
+}
+
--- a/bitnami/nginx/README.md
+++ b/bitnami/nginx/README.md
@@ -46,11 +46,10 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).


-* [`1.16-ol-7`, `1.16.0-ol-7-r1` (1.16/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/1.16.0-ol-7-r1/1.16/ol-7/Dockerfile)
+* [`1.16-ol-7`, `1.16.0-ol-7-r2` (1.16/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/1.16.0-ol-7-r2/1.16/ol-7/Dockerfile)
 * [`1.16-debian-9`, `1.16.0-debian-9-r2`, `1.16`, `1.16.0`, `1.16.0-r2`, `latest` (1.16/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/1.16.0-debian-9-r2/1.16/debian-9/Dockerfile)
 * [`1.16-rhel-7`, `0.0.0-rhel-7-r0` (1.16/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/0.0.0-rhel-7-r0/1.16/rhel-7/Dockerfile)

-
 # Get this image

 The recommended way to get the Bitnami NGINX Open Source Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/nginx).
@@ -303,7 +302,7 @@ RUN install_packages xxx yyy zzz
 RUN . ./libcomponent.sh && component_unpack "nginx" "a.b.c-0"
 ...
 COPY rootfs /
-RUN /prepare.sh
+RUN /postunpack.sh
 ...
 ENV BITNAMI_APP_NAME="nginx" ...
 EXPOSE 8080 8443
@@ -468,8 +467,7 @@ $ docker-compose up nginx

 # Useful Links

- [Create An EMP Development Environment With Bitnami Containers
-](https://docs.bitnami.com/containers/how-to/create-emp-environment-containers/)
+- [Create An EMP Development Environment With Bitnami Containers](https://docs.bitnami.com/containers/how-to/create-emp-environment-containers/)

 # Contributing