mirror of
https://github.com/bitnami/containers.git
synced 2026-02-24 07:07:37 +08:00
entrypoint: remove references to entrypoint.sh from base image
This commit is contained in:
@@ -3,15 +3,13 @@ MAINTAINER Bitnami <containers@bitnami.com>
|
||||
|
||||
ENV BITNAMI_IMAGE_VERSION=9.6.2-r0 \
|
||||
BITNAMI_APP_NAME=postgresql \
|
||||
BITNAMI_APP_USER=postgres
|
||||
|
||||
PATH=/opt/bitnami/postgresql/bin:$PATH
|
||||
|
||||
# System packages required
|
||||
RUN install_packages libc6 libssl1.0.0 zlib1g libxml2 liblzma5 libedit2 libbsd0 libtinfo5 libxslt1.1
|
||||
|
||||
# Install postgresql
|
||||
RUN bitnami-pkg unpack postgresql-9.6.2-0 --checksum b706396cc1a435741e4db319f8028d716047cc4d40e6b3418c16944f6661f90f
|
||||
ENV PATH=/opt/bitnami/postgresql/sbin:/opt/bitnami/postgresql/bin:$PATH
|
||||
|
||||
COPY rootfs /
|
||||
|
||||
|
||||
@@ -1,21 +1,13 @@
|
||||
#!/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 &
|
||||
|
||||
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
|
||||
initialize postgresql
|
||||
echo "Starting application ..."
|
||||
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
|
||||
nami_initialize postgresql
|
||||
info "Starting postgresql..."
|
||||
fi
|
||||
|
||||
exec /entrypoint.sh "$@"
|
||||
exec tini -- "$@"
|
||||
|
||||
Reference in New Issue
Block a user