use the entrypoint.sh script from the base image

This commit is contained in:
Sameer Naik
2015-10-04 14:27:08 +05:30
parent e201b02caf
commit 5552cbd109
3 changed files with 2 additions and 16 deletions

View File

@@ -3,6 +3,7 @@ MAINTAINER Bitnami <containers@bitnami.com>
ENV BITNAMI_APP_NAME=memcached \
BITNAMI_APP_USER=memcached \
BITNAMI_APP_DAEMON=memcached \
BITNAMI_APP_VERSION=1.4.24-1
ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/$BITNAMI_APP_NAME \

View File

@@ -1,15 +0,0 @@
#!/bin/bash
if [ "${1:0:1}" = '-' ]; then
export EXTRA_OPTIONS="$@"
set --
elif [ "${1}" == "memcached" -o "${1}" == "$(which memcached)" ]; then
export EXTRA_OPTIONS="${@:2}"
set --
fi
if [ -n "${1}" ]; then
touch /etc/services.d/$BITNAMI_APP_NAME/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 memcached -v -u $BITNAMI_APP_USER -l 0.0.0.0 ${MEMCACHED_PASSWORD:+-S} ${EXTRA_OPTIONS:+"$EXTRA_OPTIONS"} >> $BITNAMI_APP_VOL_PREFIX/logs/memcached.log 2>&1
exec $BITNAMI_APP_DAEMON -v -u $BITNAMI_APP_USER -l 0.0.0.0 ${MEMCACHED_PASSWORD:+-S} ${EXTRA_OPTIONS:+"$EXTRA_OPTIONS"} >> $BITNAMI_APP_VOL_PREFIX/logs/memcached.log 2>&1