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 17:33:11 +05:30
parent cbc7c09a5b
commit 10a9392334
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bitnami/rails/Dockerfile
View File

@ -1,31 +1,11 @@
## BUILDING
## (from project root directory)
## $ docker build -t ruby-for-bitnami-bitnami-docker-rails .
##
## RUNNING
## $ docker run -p 3000:3000 ruby-for-bitnami-bitnami-docker-rails
##
## 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
FROM gcr.io/stacksmith-images/minideb-buildpack:jessie-r9
MAINTAINER Bitnami <containers@bitnami.com>
ENV STACKSMITH_STACK_ID="hw4vyh1" \
STACKSMITH_STACK_NAME="Ruby for bitnami/bitnami-docker-rails" \
STACKSMITH_STACK_PRIVATE="1"
RUN bitnami-pkg install ruby-2.3.1-2 --checksum 041625b9f363a99b2e66f0209a759abe7106232e0fcc3a970958bf73d5a4d9b0
ENV PATH=/opt/bitnami/ruby/bin:/opt/bitnami/mysql/bin:$PATH
## STACKSMITH-END: Modifications below this line will be unchanged when regenerating
RUN bitnami-pkg install imagemagick-6.7.5-10-3 --checksum 617e85a42c80f58c568f9bc7337e24c03e35cf4c7c22640407a7e1e16880cf88
RUN bitnami-pkg install mysql-libraries-10.1.19-0 --checksum 6729ab22f06052af981b0a78e9f4a700d4cbc565d771e9c6c874f1f57fdb76d2
RUN bitnami-pkg install mysql-client-10.1.19-0 --checksum fdbc292bedabeaf0148d66770b8aa0ab88012ce67b459d6ba2b46446c91bb79c
@ -41,10 +21,14 @@ ENV RAILS_ENV=development
ENV BITNAMI_APP_NAME=rails
ENV BITNAMI_IMAGE_VERSION=5.0.0.1-r6
COPY rootfs/ /
USER bitnami
WORKDIR /app
EXPOSE 3000
COPY rootfs/ /
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0", "-p", "3000"]

10
bitnami/rails/rootfs/app-entrypoint.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
set -e
#!/bin/bash -e
. /opt/bitnami/base/functions
INIT_SEM=/tmp/initialized.sem
@ -40,10 +40,6 @@ migrate_db() {
bundle exec rails db:migrate
}
log () {
echo -e "\033[0;33m$(date "+%H:%M:%S")\033[0;37m ==> $1."
}
if [ "$1" == "bundle" -a "$2" == "exec" ]; then
if ! app_present; then
log "Creating rails application"
@ -80,4 +76,4 @@ if [ "$1" == "bundle" -a "$2" == "exec" ]; then
[[ -z $SKIP_DB_SETUP ]] && migrate_db
fi
exec /entrypoint.sh "$@"
exec tini -- "$@"