use the entrypoint.sh script from the base image

This commit is contained in:
Sameer Naik
2015-10-04 14:34:36 +05:30
parent 45b4f4e354
commit 0d5bfb64be
3 changed files with 2 additions and 17 deletions

View File

@@ -3,6 +3,7 @@ MAINTAINER Bitnami <containers@bitnami.com>
ENV BITNAMI_APP_NAME=redis \
BITNAMI_APP_USER=redis \
BITNAMI_APP_DAEMON=redis-server \
BITNAMI_APP_VERSION=3.0.4-0
ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/$BITNAMI_APP_NAME \

View File

@@ -1,16 +0,0 @@
#!/bin/bash
if [ "${1:0:1}" = '-' ]; then
export EXTRA_OPTIONS="$@"
set --
elif [ "${1}" == "redis-server" -o "${1}" == "$(which redis-server)" ]; then
export EXTRA_OPTIONS="${@:2}"
set --
fi
if [ -n "${1}" ]; then
touch /etc/services.d/$BITNAMI_APP_NAME/down
touch /etc/services.d/$BITNAMI_APP_NAME-logs/down
fi
exec /init "$@"

View File

@@ -4,4 +4,4 @@ source $BITNAMI_PREFIX/bitnami-utils.sh
mkdir -p $BITNAMI_APP_DIR/tmp
date '+%d%H%M%S' > $BITNAMI_APP_DIR/tmp/start
exec s6-setuidgid $BITNAMI_APP_USER redis-server $BITNAMI_APP_VOL_PREFIX/conf/redis.conf $PROGRAM_OPTIONS ${EXTRA_OPTIONS:+"$EXTRA_OPTIONS"}
exec s6-setuidgid $BITNAMI_APP_USER $BITNAMI_APP_DAEMON $BITNAMI_APP_VOL_PREFIX/conf/redis.conf $PROGRAM_OPTIONS ${EXTRA_OPTIONS:+"$EXTRA_OPTIONS"}