Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-12 06:48:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'entrypoint-disambiguation

Browse Source
This commit is contained in:
Sameer Naik
2017-02-14 16:42:49 +05:30
parent c001488228 42fb335033
commit b3bca773bd
2 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bitnami/redis/Dockerfile
View File

@@ -3,19 +3,26 @@ MAINTAINER Bitnami <containers@bitnami.com>
ENV BITNAMI_IMAGE_VERSION=3.2.8-r0 \ ENV BITNAMI_IMAGE_VERSION=3.2.8-r0 \
BITNAMI_APP_NAME=redis \ BITNAMI_APP_NAME=redis \
BITNAMI_APP_USER=redis PATH=/opt/bitnami/redis/bin:$PATH
# System packages required # System packages required
RUN install_packages libc6 RUN install_packages libc6
# Install redis # Install redis
RUN bitnami-pkg unpack redis-3.2.8-0 --checksum 2dcd69c0bbcb6e2ab82975d39ee32c2795c612e85012d599d36553c4f5ab8f3d 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
COPY rootfs / COPY rootfs /
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["nami", "start", "--foreground", "redis"]
VOLUME ["/bitnami/$BITNAMI_APP_NAME"] ENV REDIS_PASSWORD= \
REDIS_REPLICATION_MODE= \
REDIS_MASTER_HOST= \
REDIS_MASTER_PORT=6379 \
REDIS_MASTER_PASSWORD=
VOLUME ["/bitnami/redis"]
EXPOSE 6379 EXPOSE 6379
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["nami", "start", "--foreground", "redis"]

31
bitnami/redis/rootfs/app-entrypoint.sh
View File

@@ -1,28 +1,13 @@
#!/bin/bash -e #!/bin/bash -e
. /opt/bitnami/base/functions
. /opt/bitnami/base/helpers
function initialize { print_welcome_page
# Package can be "installed" or "unpacked" check_for_updates &
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
}
# Set default values if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
export REDIS_PASSWORD=${REDIS_PASSWORD:-} nami_initialize redis
export REDIS_REPLICATION_MODE=${REDIS_REPLICATION_MODE:-} info "Starting redis..."
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 ..."
fi fi
exec /entrypoint.sh "$@" exec tini -- "$@"