From b0a86e70368b6eab8e03a080f6682dd7549774ec Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 6 Jun 2018 17:09:17 +0000 Subject: [PATCH] 8.5.3-r27 release Add httpPort input for the Drupal module --- bitnami/drupal/8/Dockerfile | 18 ++++++++++-------- bitnami/drupal/8/rootfs/app-entrypoint.sh | 2 +- bitnami/drupal/8/rootfs/drupal-inputs.json | 2 ++ bitnami/drupal/8/rootfs/init.sh | 6 +++--- bitnami/drupal/README.md | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/bitnami/drupal/8/Dockerfile b/bitnami/drupal/8/Dockerfile index f80caa3f4959..3c07b1390132 100644 --- a/bitnami/drupal/8/Dockerfile +++ b/bitnami/drupal/8/Dockerfile @@ -1,24 +1,26 @@ -FROM bitnami/minideb-extras:jessie-r61 +FROM bitnami/minideb-extras:jessie-r68 LABEL maintainer "Bitnami " # Install required system packages and dependencies -RUN install_packages libapr1 libaprutil1 libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libuuid1 libxml2 libxslt1.1 zlib1g -RUN bitnami-pkg unpack apache-2.4.33-3 --checksum 55bc664737e2ff9d534468088424ee4b04e770e67800e317c9db5b1e58cf2ffe -RUN bitnami-pkg unpack php-7.1.18-0 --checksum 25874b1673343ee7e1d87900e47a88887f83b595d079549465df826f2e76d497 +RUN install_packages libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libxml2 libxslt1.1 zlib1g +RUN bitnami-pkg unpack apache-2.4.33-4 --checksum f26751a96abdc45db43c4b92eb9f792a4b630ad0edd5667aa73ccafa0aeb3810 +RUN bitnami-pkg unpack php-7.1.18-1 --checksum 56f43b9ae65d24e2602ad4c1f1af6392be92a281684c80d62ba81c195d372c97 RUN bitnami-pkg unpack mysql-client-10.1.33-0 --checksum 1b1608f1c1f4e21f05037225e095c49035ad8bfdb8b580abbb904c9f2448a5c6 -RUN bitnami-pkg install libphp-7.1.18-1 --checksum 91377f8ead820dad9e1d498b63b0b6d4dff93c7f4681c9a07e01b3d1bcb8f95b -RUN bitnami-pkg unpack drupal-8.5.3-3 --checksum 8c46b82842b947f1fcc1afd8f8d7a427614c8980a7eb910e07f7371c912c2a3d +RUN bitnami-pkg install libphp-7.1.18-2 --checksum d6b0e8686332b5af34c988412a2a1b18ba2fd6dda8781b9dc7c6ea3b243aba89 +RUN bitnami-pkg unpack drupal-8.5.3-4 --checksum 7d6ab4892ac62fa7b57f0714cde458f04960beacdf70b663cfcd898a8be5877f COPY rootfs / ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="443" \ APACHE_HTTP_PORT_NUMBER="80" \ BITNAMI_APP_NAME="drupal" \ - BITNAMI_IMAGE_VERSION="8.5.3-r26" \ + BITNAMI_IMAGE_VERSION="8.5.3-r27" \ DRUPAL_DATABASE_NAME="bitnami_drupal" \ DRUPAL_DATABASE_PASSWORD="" \ DRUPAL_DATABASE_USER="bn_drupal" \ DRUPAL_EMAIL="user@example.com" \ + DRUPAL_HTTPS_PORT="443" \ + DRUPAL_HTTP_PORT="80" \ DRUPAL_PASSWORD="bitnami" \ DRUPAL_USERNAME="user" \ MARIADB_HOST="mariadb" \ @@ -34,4 +36,4 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ EXPOSE 80 443 ENTRYPOINT ["/app-entrypoint.sh"] -CMD ["/run.sh"] +CMD ["./run.sh"] diff --git a/bitnami/drupal/8/rootfs/app-entrypoint.sh b/bitnami/drupal/8/rootfs/app-entrypoint.sh index 3a2d75fca6bf..6bc99d780ce6 100755 --- a/bitnami/drupal/8/rootfs/app-entrypoint.sh +++ b/bitnami/drupal/8/rootfs/app-entrypoint.sh @@ -5,7 +5,7 @@ print_welcome_page -if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then +if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "./run.sh" ]]; then . /init.sh nami_initialize apache php mysql-client drupal info "Starting drupal... " diff --git a/bitnami/drupal/8/rootfs/drupal-inputs.json b/bitnami/drupal/8/rootfs/drupal-inputs.json index fd5d8df8adba..a34b22b90be6 100644 --- a/bitnami/drupal/8/rootfs/drupal-inputs.json +++ b/bitnami/drupal/8/rootfs/drupal-inputs.json @@ -5,6 +5,8 @@ "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}", "databaseUser": "{{$global.env.DRUPAL_DATABASE_USER}}", "email": "{{$global.env.DRUPAL_EMAIL}}", + "httpPort": "{{$global.env.DRUPAL_HTTP_PORT}}", + "httpsPort": "{{$global.env.DRUPAL_HTTPS_PORT}}", "password": "{{$global.env.DRUPAL_PASSWORD}}", "username": "{{$global.env.DRUPAL_USERNAME}}" } \ No newline at end of file diff --git a/bitnami/drupal/8/rootfs/init.sh b/bitnami/drupal/8/rootfs/init.sh index 9f7a345bc66a..00d1f523cf30 100644 --- a/bitnami/drupal/8/rootfs/init.sh +++ b/bitnami/drupal/8/rootfs/init.sh @@ -22,8 +22,8 @@ else if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" && -z "$MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" ]]; then empty_password_error MYSQL_CLIENT_CREATE_DATABASE_PASSWORD fi - # Drupal database - if [[ -z "$DRUPAL_DATABASE_PASSWORD" ]]; then - empty_password_error DRUPAL_DATABASE_PASSWORD + # WordPress database + if [[ -z "$WORDPRESS_DATABASE_PASSWORD" ]]; then + empty_password_error WORDPRESS_DATABASE_PASSWORD fi fi diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md index 5dcfbd215c29..6524141324d3 100644 --- a/bitnami/drupal/README.md +++ b/bitnami/drupal/README.md @@ -25,9 +25,9 @@ $ docker-compose up -d # Supported tags and respective `Dockerfile` links +* [`8`, `8.5.3-r27`, `latest` (8/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.3-r27/8/Dockerfile) * [`8-ol-7`, `8.5.3-ol-7-r0` (8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.3-ol-7-r0/8/ol-7/Dockerfile) * [`8-rhel-7`, `8.5.3-rhel-7-r1` (8/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.3-rhel-7-r1/8/rhel-7/Dockerfile) -* [`8`, `8.5.3-r26`, `latest` (8/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.3-r26/8/Dockerfile) * [`8-php5-rhel-7`, `8.5.3-php5-rhel-7-r0` (8-php5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.3-php5-rhel-7-r0/8-php5/rhel-7/Dockerfile) Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).