From e2e5fb287c04e2b09dda7773e8041971e48c7c72 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 2 May 2019 16:14:24 +0000 Subject: [PATCH] 1.16.0-debian-9-r3 release --- bitnami/nginx/1.16/debian-9/Dockerfile | 16 +++-- .../nginx/1.16/debian-9/docker-compose.yml | 2 - .../nginx/1.16/debian-9/rootfs/libnginx.sh | 4 +- .../1.16/debian-9/rootfs/nginx-inputs.json | 5 ++ .../extra/nginx/templates/nginx.conf.tpl | 64 +++++++++++++++++++ bitnami/nginx/README.md | 4 +- bitnami/nginx/docker-compose.yml | 2 - 7 files changed, 84 insertions(+), 13 deletions(-) create mode 100644 bitnami/nginx/1.16/debian-9/rootfs/nginx-inputs.json create mode 100644 bitnami/nginx/1.16/debian-9/rootfs/opt/bitnami/extra/nginx/templates/nginx.conf.tpl diff --git a/bitnami/nginx/1.16/debian-9/Dockerfile b/bitnami/nginx/1.16/debian-9/Dockerfile index 851026a936de..7656b9c43ea8 100644 --- a/bitnami/nginx/1.16/debian-9/Dockerfile +++ b/bitnami/nginx/1.16/debian-9/Dockerfile @@ -9,20 +9,26 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ # Install required system packages and dependencies RUN install_packages libc6 libpcre3 libssl1.1 zlib1g -RUN . ./libcomponent.sh && component_unpack "nginx" "1.16.0-0" --checksum b08c5b2a428e2e54726d47e290102496780db1ddd4a0a67bed82da6c34e56784 +RUN . ./libcomponent.sh && component_unpack "nginx" "1.16.0-1" --checksum c8e9546c7521b136863423c35d748ddc66bb59d65a157501df2c57254c2df3f8 +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-debian-9-r2" \ + BITNAMI_IMAGE_VERSION="1.16.0-debian-9-r3" \ 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" ] diff --git a/bitnami/nginx/1.16/debian-9/docker-compose.yml b/bitnami/nginx/1.16/debian-9/docker-compose.yml index 99327593e03a..0141de336e39 100644 --- a/bitnami/nginx/1.16/debian-9/docker-compose.yml +++ b/bitnami/nginx/1.16/debian-9/docker-compose.yml @@ -5,5 +5,3 @@ services: image: 'bitnami/nginx:1.16' ports: - '80:8080' - environment: - - NGINX_HTTP_PORT_NUMBER=8080 diff --git a/bitnami/nginx/1.16/debian-9/rootfs/libnginx.sh b/bitnami/nginx/1.16/debian-9/rootfs/libnginx.sh index c4796cb07d9b..3cd806622352 100644 --- a/bitnami/nginx/1.16/debian-9/rootfs/libnginx.sh +++ b/bitnami/nginx/1.16/debian-9/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..." diff --git a/bitnami/nginx/1.16/debian-9/rootfs/nginx-inputs.json b/bitnami/nginx/1.16/debian-9/rootfs/nginx-inputs.json new file mode 100644 index 000000000000..40475df8964c --- /dev/null +++ b/bitnami/nginx/1.16/debian-9/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}}" +} \ No newline at end of file diff --git a/bitnami/nginx/1.16/debian-9/rootfs/opt/bitnami/extra/nginx/templates/nginx.conf.tpl b/bitnami/nginx/1.16/debian-9/rootfs/opt/bitnami/extra/nginx/templates/nginx.conf.tpl new file mode 100644 index 000000000000..baa4c22a3107 --- /dev/null +++ b/bitnami/nginx/1.16/debian-9/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; + } + } +} + diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md index b1b95aa0cf22..868812b8422a 100644 --- a/bitnami/nginx/README.md +++ b/bitnami/nginx/README.md @@ -46,8 +46,8 @@ 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-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-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-debian-9`, `1.16.0-debian-9-r3`, `1.16`, `1.16.0`, `1.16.0-r3`, `latest` (1.16/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/1.16.0-debian-9-r3/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 diff --git a/bitnami/nginx/docker-compose.yml b/bitnami/nginx/docker-compose.yml index 99327593e03a..0141de336e39 100644 --- a/bitnami/nginx/docker-compose.yml +++ b/bitnami/nginx/docker-compose.yml @@ -5,5 +5,3 @@ services: image: 'bitnami/nginx:1.16' ports: - '80:8080' - environment: - - NGINX_HTTP_PORT_NUMBER=8080