mirror of
https://github.com/bitnami/containers.git
synced 2026-02-22 08:07:24 +08:00
Merge branch 'entrypoint-disambiguation
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -20,6 +20,15 @@ RUN bitnami-pkg unpack opencart-2.3.0.2-3 --checksum 92e9d059beff6cea9df091cc197
|
||||
|
||||
COPY rootfs /
|
||||
|
||||
ENV APACHE_HTTP_PORT="80" \
|
||||
APACHE_HTTPS_PORT="443" \
|
||||
OPENCART_USERNAME="user" \
|
||||
OPENCART_PASSWORD="bitnami1" \
|
||||
OPENCART_EMAIL="user@example.com" \
|
||||
MARIADB_USER="root" \
|
||||
MARIADB_HOST="mariadb" \
|
||||
MARIADB_PORT="3306"
|
||||
|
||||
VOLUME ["/bitnami/opencart", "/bitnami/apache", "/bitnami/php"]
|
||||
|
||||
EXPOSE 80 443
|
||||
|
||||
@@ -1,34 +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
|
||||
# Clean up inputs
|
||||
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 OPENCART_USERNAME=${OPENCART_USERNAME:-"user"}
|
||||
export OPENCART_PASSWORD=${OPENCART_PASSWORD:-"bitnami1"}
|
||||
export OPENCART_EMAIL=${OPENCART_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 opencart; do
|
||||
initialize $module
|
||||
done
|
||||
echo "Starting application ..."
|
||||
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
|
||||
nami_initialize apache php opencart
|
||||
info "Starting opencart..."
|
||||
fi
|
||||
|
||||
exec /entrypoint.sh "$@"
|
||||
exec tini -- "$@"
|
||||
|
||||
Reference in New Issue
Block a user