diff --git a/bitnami/nginx/1.12/Dockerfile b/bitnami/nginx/1.12/Dockerfile deleted file mode 100644 index 82244a1c9217..000000000000 --- a/bitnami/nginx/1.12/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM bitnami/minideb-extras:jessie-r28 -LABEL maintainer "Bitnami " - -ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ - BITNAMI_PKG_EXTRA_DIRS="/bitnami/nginx/conf" \ - HOME="/" - -# Install required system packages and dependencies -RUN install_packages libc6 libpcre3 libssl1.0.0 zlib1g -RUN bitnami-pkg unpack nginx-1.12.2-0 --checksum cb54ea083954cddbd3d9a93eeae0b81247176235c966a7b5e70abc3c944d4339 -RUN ln -sf /opt/bitnami/nginx/html /app -RUN ln -sf /dev/stdout /opt/bitnami/nginx/logs/access.log -RUN ln -sf /dev/stdout /opt/bitnami/nginx/logs/error.log - -COPY rootfs / -ENV BITNAMI_APP_NAME="nginx" \ - BITNAMI_IMAGE_VERSION="1.12.2-r5" \ - NGINX_DAEMON_GROUP="" \ - NGINX_DAEMON_USER="" \ - NGINX_HTTPS_PORT_NUMBER="8443" \ - NGINX_HTTP_PORT_NUMBER="8080" \ - PATH="/opt/bitnami/nginx/sbin:$PATH" - -EXPOSE 8080 8443 - -WORKDIR /app -USER 1001 -ENTRYPOINT ["/app-entrypoint.sh"] -CMD ["nginx","-g","daemon off;"] diff --git a/bitnami/nginx/1.12/docker-compose.yml b/bitnami/nginx/1.12/docker-compose.yml deleted file mode 100644 index 79646fb2942f..000000000000 --- a/bitnami/nginx/1.12/docker-compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: '2' - -services: - nginx: - image: 'bitnami/nginx:1.12' - labels: - kompose.service.type: nodeport - ports: - - '80:8080' - - '443:8443' - volumes: - - 'nginx_data:/bitnami' - -volumes: - nginx_data: - driver: local diff --git a/bitnami/nginx/1.12/rootfs/app-entrypoint.sh b/bitnami/nginx/1.12/rootfs/app-entrypoint.sh deleted file mode 100755 index d79474653b52..000000000000 --- a/bitnami/nginx/1.12/rootfs/app-entrypoint.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -e - -. /opt/bitnami/base/functions -. /opt/bitnami/base/helpers - -print_welcome_page - -if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "nginx" ]]; then - nami_initialize nginx - info "Starting nginx... " -fi - -exec tini -- "$@" diff --git a/bitnami/nginx/1.12/rootfs/nginx-inputs.json b/bitnami/nginx/1.12/rootfs/nginx-inputs.json deleted file mode 100644 index 47ac7e683346..000000000000 --- a/bitnami/nginx/1.12/rootfs/nginx-inputs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "httpPort": "{{$global.env.NGINX_HTTP_PORT_NUMBER}}", - "httpsPort": "{{$global.env.NGINX_HTTPS_PORT_NUMBER}}", - "systemGroup": "{{$global.env.NGINX_DAEMON_GROUP}}", - "systemUser": "{{$global.env.NGINX_DAEMON_USER}}" -} \ No newline at end of file diff --git a/bitnami/nginx/1.14/docker-compose.yml b/bitnami/nginx/1.14/docker-compose.yml index 79646fb2942f..5d7c53789057 100644 --- a/bitnami/nginx/1.14/docker-compose.yml +++ b/bitnami/nginx/1.14/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: nginx: - image: 'bitnami/nginx:1.12' + image: 'bitnami/nginx:1.14' labels: kompose.service.type: nodeport ports: