Remove 1.12 folder and update docker-compose file of the version 1.14 (#99)

This commit is contained in:
Juan José Martos
2018-04-25 15:28:18 +02:00
committed by GitHub
parent 1cdb126581
commit 730a072423
5 changed files with 1 additions and 65 deletions

View File

@@ -1,29 +0,0 @@
FROM bitnami/minideb-extras:jessie-r28
LABEL maintainer "Bitnami <containers@bitnami.com>"
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;"]

View File

@@ -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

View File

@@ -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 -- "$@"

View File

@@ -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}}"
}

View File

@@ -2,7 +2,7 @@ version: '2'
services:
nginx:
image: 'bitnami/nginx:1.12'
image: 'bitnami/nginx:1.14'
labels:
kompose.service.type: nodeport
ports: