From 6dfcdfe353ce61799082a1934c864afb4a0e3d70 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 20 Aug 2019 09:03:18 +0000 Subject: [PATCH] 3.0.1-debian-9-r0 release --- bitnami/dreamfactory/3/debian-9/Dockerfile | 46 +++++++++++++++++++ .../3/debian-9/docker-compose.yml | 39 ++++++++++++++++ .../3/debian-9/rootfs/apache-init.sh | 27 +++++++++++ .../3/debian-9/rootfs/apache-inputs.json | 6 +++ .../3/debian-9/rootfs/app-entrypoint.sh | 14 ++++++ .../debian-9/rootfs/dreamfactory-inputs.json | 18 ++++++++ bitnami/dreamfactory/README.md | 4 +- bitnami/dreamfactory/docker-compose.yml | 2 +- 8 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 bitnami/dreamfactory/3/debian-9/Dockerfile create mode 100644 bitnami/dreamfactory/3/debian-9/docker-compose.yml create mode 100644 bitnami/dreamfactory/3/debian-9/rootfs/apache-init.sh create mode 100644 bitnami/dreamfactory/3/debian-9/rootfs/apache-inputs.json create mode 100755 bitnami/dreamfactory/3/debian-9/rootfs/app-entrypoint.sh create mode 100644 bitnami/dreamfactory/3/debian-9/rootfs/dreamfactory-inputs.json diff --git a/bitnami/dreamfactory/3/debian-9/Dockerfile b/bitnami/dreamfactory/3/debian-9/Dockerfile new file mode 100644 index 000000000000..f4c83d9cab0b --- /dev/null +++ b/bitnami/dreamfactory/3/debian-9/Dockerfile @@ -0,0 +1,46 @@ +FROM bitnami/minideb-extras:stretch-r455 +LABEL maintainer "Bitnami " + +# Install required system packages and dependencies +RUN install_packages libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu57 libidn11 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses5 libnettle6 libnghttp2-14 libp11-kit0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.0.2 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5 libtinfo5 libunistring0 libuv1 libxml2 libxslt1.1 zlib1g +RUN bitnami-pkg unpack apache-2.4.41-0 --checksum fff3848b005264ae25caa93cf3dae84b263619eb028837edf3f7e480a3254fd1 +RUN bitnami-pkg install redis-client-5.0.5-0 --checksum 16bf4512016b4c458cd4e42d2cb18641678674a8bdf6152856b1374b20d5baa7 +RUN bitnami-pkg unpack php-7.1.31-0 --checksum aa4c056e4a7f70024de891790e2698527ca9b11b974dd80d0138489aa92424c9 +RUN bitnami-pkg install mysql-client-10.3.17-0 --checksum 71d59fafc3e7e3e598af0c2b6788d77558630afe647ec1f922ffdd5025f3d737 +RUN bitnami-pkg install mongodb-client-4.0.12-0 --checksum e58c66cfe148818b8536f52173b91bf92ac9295e22b40e114bff2bb92bf57584 +RUN bitnami-pkg install libphp-7.1.31-1 --checksum 1b79706cccf3a98b4d921417dea9fda9b5ae105d6bb449557567b8fbc4ae2f6b +RUN bitnami-pkg unpack dreamfactory-3.0.1-0 --checksum df6b9bf059e291a77d6cfe9d0c1049138f7f2502dcbac7342f9e2f5334596177 +RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log +RUN ln -sf /dev/stderr /opt/bitnami/apache/logs/error_log + +COPY rootfs / +ENV APACHE_HTTPS_PORT_NUMBER="" \ + APACHE_HTTP_PORT_NUMBER="" \ + APACHE_SET_HTTPS_PORT="no" \ + APACHE_SET_HTTP_PORT="no" \ + BITNAMI_APP_NAME="dreamfactory" \ + BITNAMI_IMAGE_VERSION="3.0.1-debian-9-r0" \ + MARIADB_HOST="mariadb" \ + MARIADB_PASSWORD="" \ + MARIADB_PORT_NUMBER="3306" \ + MARIADB_USER="root" \ + MONGODB_HOST="mongodb" \ + MONGODB_PASSWORD="" \ + MONGODB_PORT_NUMBER="27017" \ + MONGODB_USER="" \ + PATH="/opt/bitnami/apache/bin:/opt/bitnami/redis/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/mongodb/bin:$PATH" \ + REDIS_HOST="redis" \ + REDIS_PASSWORD="" \ + REDIS_PORT_NUMBER="6379" \ + SMTP_HOST="" \ + SMTP_PASSWORD="" \ + SMTP_PORT="" \ + SMTP_PROTOCOL="" \ + SMTP_USER="" + +VOLUME [ "/certs" ] + +EXPOSE 80 443 + +ENTRYPOINT [ "/app-entrypoint.sh" ] +CMD [ "httpd", "-f", "/opt/bitnami/apache/conf/httpd.conf", "-DFOREGROUND" ] diff --git a/bitnami/dreamfactory/3/debian-9/docker-compose.yml b/bitnami/dreamfactory/3/debian-9/docker-compose.yml new file mode 100644 index 000000000000..aa5e2ae9a548 --- /dev/null +++ b/bitnami/dreamfactory/3/debian-9/docker-compose.yml @@ -0,0 +1,39 @@ +version: '2' + +services: + mariadb: + image: 'bitnami/mariadb:10.3' + environment: + - ALLOW_EMPTY_PASSWORD=yes + volumes: + - 'mariadb_data:/bitnami' + redis: + image: 'bitnami/redis:5.0' + environment: + - ALLOW_EMPTY_PASSWORD=yes + volumes: + - 'redis_data:/bitnami' + mongodb: + image: 'bitnami/mongodb:4.0' + volumes: + - 'mongodb_data:/bitnami' + dreamfactory: + image: 'bitnami/dreamfactory:3' + ports: + - '80:80' + - '443:443' + depends_on: + - mariadb + - redis + - mongodb + volumes: + - 'dreamfactory_data:/bitnami' +volumes: + mariadb_data: + driver: local + redis_data: + driver: local + mongodb_data: + driver: local + dreamfactory_data: + driver: local diff --git a/bitnami/dreamfactory/3/debian-9/rootfs/apache-init.sh b/bitnami/dreamfactory/3/debian-9/rootfs/apache-init.sh new file mode 100644 index 000000000000..940efb6d8576 --- /dev/null +++ b/bitnami/dreamfactory/3/debian-9/rootfs/apache-init.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +# Check whether Apache ports must be configured +if [[ -n "${APACHE_HTTP_PORT_NUMBER:-}" ]]; then + export APACHE_SET_HTTP_PORT="yes" +fi +if [[ -n "${APACHE_HTTPS_PORT_NUMBER:-}" ]]; then + export APACHE_SET_HTTPS_PORT="yes" +fi + +# Copy vhosts file +if [[ "$(ls -A /vhosts 2>/dev/null)" ]]; then + info "Found vhost definitions in /vhosts. Copying them to /opt/bitnami/apache/conf/vhosts" + cp -r /vhosts/* /opt/bitnami/apache/conf/vhosts +fi + +# Mount certificate files +if [[ -d "/opt/bitnami/apache/certs" ]]; then + warn "The directory '/opt/bitnami/apache/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/opt/bitnami/apache/conf/bitnami/certs' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#using-custom-ssl-certificates" + warn "Restoring certificates at '/opt/bitnami/apache/certs' to '/opt/bitnami/apache/conf/bitnami/certs'..." + rm -rf /opt/bitnami/apache/conf/bitnami/certs + ln -sf /opt/bitnami/apache/certs /opt/bitnami/apache/conf/bitnami/certs +elif [ "$(ls -A /certs 2>/dev/null)" ]; then + info "Mounting certificates files from /certs..." + rm -rf /opt/bitnami/apache/conf/bitnami/certs + ln -sf /certs /opt/bitnami/apache/conf/bitnami/certs +fi diff --git a/bitnami/dreamfactory/3/debian-9/rootfs/apache-inputs.json b/bitnami/dreamfactory/3/debian-9/rootfs/apache-inputs.json new file mode 100644 index 000000000000..25e01aaf4e76 --- /dev/null +++ b/bitnami/dreamfactory/3/debian-9/rootfs/apache-inputs.json @@ -0,0 +1,6 @@ +{ + "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}", + "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}", + "setHttpPort": "{{$global.env.APACHE_SET_HTTP_PORT}}", + "setHttpsPort": "{{$global.env.APACHE_SET_HTTPS_PORT}}" +} \ No newline at end of file diff --git a/bitnami/dreamfactory/3/debian-9/rootfs/app-entrypoint.sh b/bitnami/dreamfactory/3/debian-9/rootfs/app-entrypoint.sh new file mode 100755 index 000000000000..50f74a4b59d4 --- /dev/null +++ b/bitnami/dreamfactory/3/debian-9/rootfs/app-entrypoint.sh @@ -0,0 +1,14 @@ +#!/bin/bash -e + +. /opt/bitnami/base/functions +. /opt/bitnami/base/helpers + +print_welcome_page + +if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "httpd" ]]; then + . /apache-init.sh + nami_initialize apache php dreamfactory + info "Starting dreamfactory... " +fi + +exec tini -- "$@" diff --git a/bitnami/dreamfactory/3/debian-9/rootfs/dreamfactory-inputs.json b/bitnami/dreamfactory/3/debian-9/rootfs/dreamfactory-inputs.json new file mode 100644 index 000000000000..c7ff6519fccd --- /dev/null +++ b/bitnami/dreamfactory/3/debian-9/rootfs/dreamfactory-inputs.json @@ -0,0 +1,18 @@ +{ + "mariadbHost": "{{$global.env.MARIADB_HOST}}", + "mariadbPassword": "{{$global.env.MARIADB_PASSWORD}}", + "mariadbPort": "{{$global.env.MARIADB_PORT_NUMBER}}", + "mariadbUser": "{{$global.env.MARIADB_USER}}", + "mongodbHost": "{{$global.env.MONGODB_HOST}}", + "mongodbPassword": "{{$global.env.MONGODB_PASSWORD}}", + "mongodbPort": "{{$global.env.MONGODB_PORT_NUMBER}}", + "mongodbUser": "{{$global.env.MONGODB_USER}}", + "redisHost": "{{$global.env.REDIS_HOST}}", + "redisPassword": "{{$global.env.REDIS_PASSWORD}}", + "redisPort": "{{$global.env.REDIS_PORT_NUMBER}}", + "smtpHost": "{{$global.env.SMTP_HOST}}", + "smtpPassword": "{{$global.env.SMTP_PASSWORD}}", + "smtpPort": "{{$global.env.SMTP_PORT}}", + "smtpProtocol": "{{$global.env.SMTP_PROTOCOL}}", + "smtpUser": "{{$global.env.SMTP_USER}}" +} \ No newline at end of file diff --git a/bitnami/dreamfactory/README.md b/bitnami/dreamfactory/README.md index 47f45e51804e..3a8ef62ddaea 100644 --- a/bitnami/dreamfactory/README.md +++ b/bitnami/dreamfactory/README.md @@ -45,8 +45,8 @@ $ kubectl apply -f test.yaml 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/). -* [`2-ol-7`, `2.14.2-ol-7-r58` (2/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-dreamfactory/blob/2.14.2-ol-7-r58/2/ol-7/Dockerfile) -* [`2-debian-9`, `2.14.2-debian-9-r56`, `2`, `2.14.2`, `2.14.2-r56`, `latest` (2/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-dreamfactory/blob/2.14.2-debian-9-r56/2/debian-9/Dockerfile) +* [`3-ol-7`, `3.0.1-ol-7-r0` (3/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-dreamfactory/blob/3.0.1-ol-7-r0/3/ol-7/Dockerfile) +* [`3-debian-9`, `3.0.1-debian-9-r0`, `3`, `3.0.1`, `3.0.1-r0`, `latest` (3/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-dreamfactory/blob/3.0.1-debian-9-r0/3/debian-9/Dockerfile) Subscribe to project updates by watching the [bitnami/dreamfactory GitHub repo](https://github.com/bitnami/bitnami-docker-dreamfactory). diff --git a/bitnami/dreamfactory/docker-compose.yml b/bitnami/dreamfactory/docker-compose.yml index 9529c9775e6c..aa5e2ae9a548 100644 --- a/bitnami/dreamfactory/docker-compose.yml +++ b/bitnami/dreamfactory/docker-compose.yml @@ -18,7 +18,7 @@ services: volumes: - 'mongodb_data:/bitnami' dreamfactory: - image: 'bitnami/dreamfactory:2' + image: 'bitnami/dreamfactory:3' ports: - '80:80' - '443:443'