From 8382abc9a031fdf73b6693faca17007e26f704bf Mon Sep 17 00:00:00 2001 From: David Barranco Date: Mon, 22 Jan 2018 11:09:40 +0100 Subject: [PATCH] Add support for two branches of MongoDB --- bitnami/mongodb/3.6/Dockerfile | 29 +++++++++++++++++++ bitnami/mongodb/{3 => 3.6}/docker-compose.yml | 2 +- .../{3 => 3.6}/rootfs/app-entrypoint.sh | 0 .../{3 => 3.6}/rootfs/mongodb-inputs.json | 0 bitnami/mongodb/{3 => 3.6}/rootfs/run.sh | 0 bitnami/mongodb/{3 => 3.7}/Dockerfile | 0 bitnami/mongodb/3.7/docker-compose.yml | 15 ++++++++++ bitnami/mongodb/3.7/rootfs/app-entrypoint.sh | 13 +++++++++ .../mongodb/3.7/rootfs/mongodb-inputs.json | 14 +++++++++ bitnami/mongodb/3.7/rootfs/run.sh | 14 +++++++++ bitnami/mongodb/circle.yml | 4 +-- bitnami/mongodb/docker-compose-replicaset.yml | 6 ++-- bitnami/mongodb/docker-compose.yml | 2 +- 13 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 bitnami/mongodb/3.6/Dockerfile rename bitnami/mongodb/{3 => 3.6}/docker-compose.yml (86%) rename bitnami/mongodb/{3 => 3.6}/rootfs/app-entrypoint.sh (100%) rename bitnami/mongodb/{3 => 3.6}/rootfs/mongodb-inputs.json (100%) rename bitnami/mongodb/{3 => 3.6}/rootfs/run.sh (100%) rename bitnami/mongodb/{3 => 3.7}/Dockerfile (100%) create mode 100644 bitnami/mongodb/3.7/docker-compose.yml create mode 100755 bitnami/mongodb/3.7/rootfs/app-entrypoint.sh create mode 100644 bitnami/mongodb/3.7/rootfs/mongodb-inputs.json create mode 100755 bitnami/mongodb/3.7/rootfs/run.sh diff --git a/bitnami/mongodb/3.6/Dockerfile b/bitnami/mongodb/3.6/Dockerfile new file mode 100644 index 000000000000..fc4cc030258e --- /dev/null +++ b/bitnami/mongodb/3.6/Dockerfile @@ -0,0 +1,29 @@ +FROM bitnami/minideb-extras:jessie-r23 +LABEL maintainer "Bitnami " + +# Install required system packages and dependencies +RUN install_packages libpcap0.8 +RUN bitnami-pkg unpack mongodb-3.6.2-0 --checksum 4c34308845d96135d6e58cf82db1b82489c51ea73b5cd6132e86b547cca763a4 + +COPY rootfs / + +ENV BITNAMI_APP_NAME="mongodb" \ + BITNAMI_IMAGE_VERSION="3.7.1-r0" \ + MONGODB_ADVERTISED_HOSTNAME="" \ + MONGODB_DATABASE="" \ + MONGODB_PASSWORD="" \ + MONGODB_PRIMARY_HOST="" \ + MONGODB_PRIMARY_PORT_NUMBER="27017" \ + MONGODB_PRIMARY_ROOT_PASSWORD="" \ + MONGODB_PRIMARY_ROOT_USER="root" \ + MONGODB_REPLICA_SET_KEY="" \ + MONGODB_REPLICA_SET_MODE="" \ + MONGODB_REPLICA_SET_NAME="replicaset" \ + MONGODB_ROOT_PASSWORD="" \ + MONGODB_USERNAME="" \ + PATH="/opt/bitnami/mongodb/bin:$PATH" + +EXPOSE 27017 + +ENTRYPOINT ["/app-entrypoint.sh"] +CMD ["/run.sh"] diff --git a/bitnami/mongodb/3/docker-compose.yml b/bitnami/mongodb/3.6/docker-compose.yml similarity index 86% rename from bitnami/mongodb/3/docker-compose.yml rename to bitnami/mongodb/3.6/docker-compose.yml index 7a96fce06682..93f4cd44ab33 100644 --- a/bitnami/mongodb/3/docker-compose.yml +++ b/bitnami/mongodb/3.6/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: mongodb: - image: 'bitnami/mongodb:3' + image: 'bitnami/mongodb:3.6' labels: kompose.service.type: nodeport ports: diff --git a/bitnami/mongodb/3/rootfs/app-entrypoint.sh b/bitnami/mongodb/3.6/rootfs/app-entrypoint.sh similarity index 100% rename from bitnami/mongodb/3/rootfs/app-entrypoint.sh rename to bitnami/mongodb/3.6/rootfs/app-entrypoint.sh diff --git a/bitnami/mongodb/3/rootfs/mongodb-inputs.json b/bitnami/mongodb/3.6/rootfs/mongodb-inputs.json similarity index 100% rename from bitnami/mongodb/3/rootfs/mongodb-inputs.json rename to bitnami/mongodb/3.6/rootfs/mongodb-inputs.json diff --git a/bitnami/mongodb/3/rootfs/run.sh b/bitnami/mongodb/3.6/rootfs/run.sh similarity index 100% rename from bitnami/mongodb/3/rootfs/run.sh rename to bitnami/mongodb/3.6/rootfs/run.sh diff --git a/bitnami/mongodb/3/Dockerfile b/bitnami/mongodb/3.7/Dockerfile similarity index 100% rename from bitnami/mongodb/3/Dockerfile rename to bitnami/mongodb/3.7/Dockerfile diff --git a/bitnami/mongodb/3.7/docker-compose.yml b/bitnami/mongodb/3.7/docker-compose.yml new file mode 100644 index 000000000000..a2cc03e9ef99 --- /dev/null +++ b/bitnami/mongodb/3.7/docker-compose.yml @@ -0,0 +1,15 @@ +version: '2' + +services: + mongodb: + image: 'bitnami/mongodb:3.7' + labels: + kompose.service.type: nodeport + ports: + - "27017:27017" + volumes: + - 'mongodb_data:/bitnami' + +volumes: + mongodb_data: + driver: local diff --git a/bitnami/mongodb/3.7/rootfs/app-entrypoint.sh b/bitnami/mongodb/3.7/rootfs/app-entrypoint.sh new file mode 100755 index 000000000000..f13e95c7658d --- /dev/null +++ b/bitnami/mongodb/3.7/rootfs/app-entrypoint.sh @@ -0,0 +1,13 @@ +#!/bin/bash -e + +. /opt/bitnami/base/functions +. /opt/bitnami/base/helpers + +print_welcome_page + +if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then + nami_initialize mongodb + info "Starting mongodb... " +fi + +exec tini -- "$@" diff --git a/bitnami/mongodb/3.7/rootfs/mongodb-inputs.json b/bitnami/mongodb/3.7/rootfs/mongodb-inputs.json new file mode 100644 index 000000000000..1ec9756ece8a --- /dev/null +++ b/bitnami/mongodb/3.7/rootfs/mongodb-inputs.json @@ -0,0 +1,14 @@ +{ + "advertisedHostname": "{{$global.env.MONGODB_ADVERTISED_HOSTNAME}}", + "database": "{{$global.env.MONGODB_DATABASE}}", + "password": "{{$global.env.MONGODB_PASSWORD}}", + "primaryHost": "{{$global.env.MONGODB_PRIMARY_HOST}}", + "primaryPort": "{{$global.env.MONGODB_PRIMARY_PORT_NUMBER}}", + "primaryRootPassword": "{{$global.env.MONGODB_PRIMARY_ROOT_PASSWORD}}", + "primaryRootUser": "{{$global.env.MONGODB_PRIMARY_ROOT_USER}}", + "replicaSetKey": "{{$global.env.MONGODB_REPLICA_SET_KEY}}", + "replicaSetMode": "{{$global.env.MONGODB_REPLICA_SET_MODE}}", + "replicaSetName": "{{$global.env.MONGODB_REPLICA_SET_NAME}}", + "rootPassword": "{{$global.env.MONGODB_ROOT_PASSWORD}}", + "username": "{{$global.env.MONGODB_USERNAME}}" +} \ No newline at end of file diff --git a/bitnami/mongodb/3.7/rootfs/run.sh b/bitnami/mongodb/3.7/rootfs/run.sh new file mode 100755 index 000000000000..7bed039bea31 --- /dev/null +++ b/bitnami/mongodb/3.7/rootfs/run.sh @@ -0,0 +1,14 @@ +#!/bin/bash +. /opt/bitnami/base/functions +. /opt/bitnami/base/helpers + +DAEMON=mongod +USER=mongo +EXEC=$(which $DAEMON) +ARGS="--config /opt/bitnami/mongodb/conf/mongodb.conf" + +# log output to stdout +sed -i 's/path: .*\/mongodb.log/path: /' /bitnami/mongodb/conf/mongodb.conf + +info "Starting ${DAEMON}..." +exec gosu ${USER} ${EXEC} ${ARGS} diff --git a/bitnami/mongodb/circle.yml b/bitnami/mongodb/circle.yml index af2c2c8b492e..5fc1d6f36e1a 100644 --- a/bitnami/mongodb/circle.yml +++ b/bitnami/mongodb/circle.yml @@ -5,8 +5,8 @@ jobs: docker: - image: docker:17.06.0-ce-git environment: - RELEASE_SERIES_LIST: "3" - LATEST_STABLE: "3" + RELEASE_SERIES_LIST: "3.6,3.7" + LATEST_STABLE: "3.6" IMAGE_NAME: mongodb CHART_NAME: mongodb CHART_REPO: https://github.com/kubernetes/charts diff --git a/bitnami/mongodb/docker-compose-replicaset.yml b/bitnami/mongodb/docker-compose-replicaset.yml index bf2baa081671..5b71522c9507 100644 --- a/bitnami/mongodb/docker-compose-replicaset.yml +++ b/bitnami/mongodb/docker-compose-replicaset.yml @@ -2,14 +2,14 @@ version: '2' services: mongodb-primary: - image: 'bitnami/mongodb:latest' + image: 'bitnami/mongodb:3.6' environment: - MONGODB_REPLICA_SET_MODE=primary volumes: - 'mongodb_master_data:/bitnami' mongodb-secondary: - image: 'bitnami/mongodb:latest' + image: 'bitnami/mongodb:3.6' depends_on: - mongodb-primary environment: @@ -17,7 +17,7 @@ services: - MONGODB_PRIMARY_HOST=mongodb-primary mongodb-arbiter: - image: 'bitnami/mongodb:latest' + image: 'bitnami/mongodb:3.6' depends_on: - mongodb-primary environment: diff --git a/bitnami/mongodb/docker-compose.yml b/bitnami/mongodb/docker-compose.yml index 46fa96159f46..93f4cd44ab33 100644 --- a/bitnami/mongodb/docker-compose.yml +++ b/bitnami/mongodb/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: mongodb: - image: 'bitnami/mongodb:latest' + image: 'bitnami/mongodb:3.6' labels: kompose.service.type: nodeport ports: