Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-05 07:29:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'entrypoint-disambiguation

Browse Source
This commit is contained in:
Sameer Naik
2017-02-14 16:31:32 +05:30
parent ea1460b6c9 6fe900022e
commit 90a039d711
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bitnami/drupal/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM gcr.io/stacksmith-images/minideb:jessie-r8
FROM gcr.io/stacksmith-images/minideb:jessie-r9
MAINTAINER Bitnami <containers@bitnami.com>
@@ -21,6 +21,15 @@ RUN bitnami-pkg unpack drupal-8.2.6-0 --checksum a8f874db6aef1e4dae22b2fd88e700b
COPY rootfs /
ENV APACHE_HTTP_PORT="80" \
APACHE_HTTPS_PORT="443" \
DRUPAL_USERNAME="user" \
DRUPAL_PASSWORD="bitnami" \
DRUPAL_EMAIL="user@example.com" \
MARIADB_USER="root" \
MARIADB_HOST="mariadb" \
MARIADB_PORT="3306"
VOLUME ["/bitnami/drupal", "/bitnami/apache", "/bitnami/php"]
EXPOSE 80 443

38
bitnami/drupal/rootfs/app-entrypoint.sh
View File

@@ -1,33 +1,13 @@
#!/bin/bash
set -e
#!/bin/bash -e
. /opt/bitnami/base/functions
. /opt/bitnami/base/helpers
function initialize {
# Package can be "installed" or "unpacked"
status=`nami inspect $1`
if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
inputs=""
if [[ -f /$1-inputs.json ]]; then
inputs=--inputs-file=/$1-inputs.json
fi
nami initialize $1 $inputs
fi
}
print_welcome_page
check_for_updates &
# Set default values
export APACHE_HTTP_PORT=${APACHE_HTTP_PORT:-"80"}
export APACHE_HTTPS_PORT=${APACHE_HTTPS_PORT:-"443"}
export DRUPAL_USERNAME=${DRUPAL_USERNAME:-"user"}
export DRUPAL_PASSWORD=${DRUPAL_PASSWORD:-"bitnami"}
export DRUPAL_EMAIL=${DRUPAL_EMAIL:-"user@example.com"}
export MARIADB_USER=${MARIADB_USER:-"root"}
export MARIADB_HOST=${MARIADB_HOST:-"mariadb"}
export MARIADB_PORT=${MARIADB_PORT:-"3306"}
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
for module in apache php drupal; do
initialize $module
done
echo "Starting application ..."
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
nami_initialize apache php drupal
info "Starting drupal..."
fi
exec /entrypoint.sh "$@"
exec tini -- "$@"