config: move default config var to Dockerfile

This commit is contained in:
Sameer Naik
2017-02-14 15:37:39 +05:30
parent c001488228
commit 3c948d203d
2 changed files with 11 additions and 11 deletions

View File

@@ -2,20 +2,27 @@ FROM gcr.io/stacksmith-images/minideb:jessie-r9
MAINTAINER Bitnami <containers@bitnami.com>
ENV BITNAMI_IMAGE_VERSION=3.2.8-r0 \
BITNAMI_APP_NAME=redis \
BITNAMI_APP_USER=redis
BITNAMI_APP_NAME=redis
# System packages required
RUN install_packages libc6
# Install redis
RUN bitnami-pkg unpack redis-3.2.8-0 --checksum 2dcd69c0bbcb6e2ab82975d39ee32c2795c612e85012d599d36553c4f5ab8f3d
ENV PATH=/opt/bitnami/$BITNAMI_APP_NAME/sbin:/opt/bitnami/$BITNAMI_APP_NAME/bin:$PATH
ENV PATH=/opt/bitnami/redis/sbin:/opt/bitnami/redis/bin:$PATH
COPY rootfs /
ENV REDIS_PASSWORD= \
REDIS_REPLICATION_MODE= \
REDIS_MASTER_HOST= \
REDIS_MASTER_PORT=6379 \
REDIS_MASTER_PASSWORD=
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["nami", "start", "--foreground", "redis"]
VOLUME ["/bitnami/$BITNAMI_APP_NAME"]
VOLUME ["/bitnami/redis"]
EXPOSE 6379

View File

@@ -13,13 +13,6 @@ function initialize {
fi
}
# Set default values
export REDIS_PASSWORD=${REDIS_PASSWORD:-}
export REDIS_REPLICATION_MODE=${REDIS_REPLICATION_MODE:-}
export REDIS_MASTER_HOST=${REDIS_MASTER_HOST:-}
export REDIS_MASTER_PORT=${REDIS_MASTER_PORT:-6379}
export REDIS_MASTER_PASSWORD=${REDIS_MASTER_PASSWORD:-}
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
initialize redis
echo "Starting application ..."