mirror of
https://github.com/bitnami/containers.git
synced 2026-03-21 15:29:05 +08:00
entrypoint: remove references to entrypoint.sh from base image
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
FROM gcr.io/stacksmith-images/minideb:jessie-r8
|
||||
FROM gcr.io/stacksmith-images/minideb:jessie-r9
|
||||
|
||||
MAINTAINER Bitnami <containers@bitnami.com>
|
||||
|
||||
ENV BITNAMI_IMAGE_VERSION=10.1.21-r0 \
|
||||
BITNAMI_APP_NAME=mariadb \
|
||||
BITNAMI_APP_USER=mysql
|
||||
PATH=/opt/bitnami/mariadb/sbin:/opt/bitnami/mariadb/bin:$PATH
|
||||
|
||||
# System packages required
|
||||
RUN install_packages libc6 libaio1 zlib1g libjemalloc1 libssl1.0.0 libstdc++6 libgcc1 libncurses5 libtinfo5
|
||||
@@ -12,8 +12,6 @@ RUN install_packages libc6 libaio1 zlib1g libjemalloc1 libssl1.0.0 libstdc++6 li
|
||||
# Install mariadb
|
||||
RUN bitnami-pkg unpack mariadb-10.1.21-0 --checksum ecf191e709c35881b69ff5aea22da984b6d05d4b751a0d5a72fa74bb02b71eea
|
||||
|
||||
ENV PATH=/opt/bitnami/mariadb/sbin:/opt/bitnami/mariadb/bin:$PATH
|
||||
|
||||
COPY rootfs /
|
||||
|
||||
ENV MARIADB_ROOT_PASSWORD= \
|
||||
|
||||
@@ -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 mariadb
|
||||
echo "Starting application ..."
|
||||
nami_initialize mariadb
|
||||
info "Starting mariadb..."
|
||||
fi
|
||||
|
||||
exec /entrypoint.sh "$@"
|
||||
exec tini -- "$@"
|
||||
|
||||
Reference in New Issue
Block a user