public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

entrypoint: remove references to `entrypoint.sh` from base image

This commit is contained in:
Sameer Naik 2017-02-14 20:16:42 +05:30
parent c49e1ad170
commit 8ab77d1683
2 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bitnami/node/Dockerfile
View File

@ -1,27 +1,7 @@
## BUILDING FROM gcr.io/stacksmith-images/minideb-buildpack:jessie-r9
## (from project root directory)
## $ docker build -t node-js-for-bitnami-bitnami-docker-node .
##
## RUNNING
## $ docker run -p 3000:3000 node-js-for-bitnami-bitnami-docker-node
##
## CONNECTING
## Lookup the IP of your active docker host using:
## $ docker-machine ip $(docker-machine active)
## Connect to the container at DOCKER_IP:3000
## replacing DOCKER_IP for the IP of your active docker host
FROM gcr.io/stacksmith-images/minideb-buildpack:jessie-r8
MAINTAINER Bitnami <containers@bitnami.com> MAINTAINER Bitnami <containers@bitnami.com>
ENV STACKSMITH_STACK_ID="npx76xt" \
STACKSMITH_STACK_NAME="Node.js for bitnami/bitnami-docker-node" \
STACKSMITH_STACK_PRIVATE="1"
## STACKSMITH-END: Modifications below this line will be unchanged when regenerating
# System packages required # System packages required
RUN install_packages libc6 libssl1.0.0 libncurses5 libtinfo5 zlib1g libbz2-1.0 libreadline6 libstdc++6 libgcc1 ghostscript imagemagick libmysqlclient18 RUN install_packages libc6 libssl1.0.0 libncurses5 libtinfo5 zlib1g libbz2-1.0 libreadline6 libstdc++6 libgcc1 ghostscript imagemagick libmysqlclient18
@ -33,13 +13,13 @@ COPY rootfs /
ENV PATH=/opt/bitnami/node/bin:/opt/bitnami/python/bin:$PATH \ ENV PATH=/opt/bitnami/node/bin:/opt/bitnami/python/bin:$PATH \
NODE_PATH=/opt/bitnami/node/lib/node_modules NODE_PATH=/opt/bitnami/node/lib/node_modules
ENV BITNAMI_APP_NAME=node \ ENV BITNAMI_APP_NAME=node \
BITNAMI_IMAGE_VERSION=7.5.0-r0 BITNAMI_IMAGE_VERSION=7.5.0-r0
EXPOSE 3000
WORKDIR /app WORKDIR /app
EXPOSE 3000
ENTRYPOINT ["/app-entrypoint.sh"] ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["node"] CMD ["node"]

24
bitnami/node/rootfs/app-entrypoint.sh
View File

@ -1,19 +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
inputs=""
if [[ -f /$1-inputs.json ]]; then
inputs=--inputs-file=/$1-inputs.json
fi
nami initialize $1 $inputs
fi
}
for module in node; do if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
initialize $module nami_initialize node
done info "Starting node..."
fi
exec /entrypoint.sh "$@" exec tini -- "$@"