Merge branch 'entrypoint-disambiguation'

bitnami/codeigniter/Dockerfile

@@ -1,11 +1,4 @@
-## BUILDING
-##   (from project root directory)
-##   $ docker build -t bitnami/bitnami-docker-codeigniter .
-##
-## RUNNING
-##   $ docker run -p 8000:8000 bitnami/bitnami-docker-codeigniter
-
-FROM gcr.io/stacksmith-images/minideb:jessie-r8
+FROM gcr.io/stacksmith-images/minideb:jessie-r9
 
 MAINTAINER Bitnami <containers@bitnami.com>
 
@@ -26,6 +19,11 @@ RUN bitnami-pkg install codeigniter-3.1.3-0 --checksum 5d653ed41a2bf4f78818f5cb2
 
 COPY rootfs /
 
+ENV MARIADB_USER="root" \
+    MARIADB_HOST="mariadb" \
+    MARIADB_PORT="3306" \
+    CODEIGNITER_PROJECT_NAME="myapp"
+
 WORKDIR /app
 
 EXPOSE 8000

bitnami/codeigniter/docker-compose.yml

@@ -2,8 +2,6 @@ version: '2'
 services:
   myapp:
     image: bitnami/codeigniter:latest
-    environment:
-      - CODEIGNITER_PROJECT_NAME=
     ports:
       - '8000:8000'
     volumes:

bitnami/codeigniter/rootfs/app-entrypoint.sh

@@ -1,19 +1,12 @@
-#!/bin/bash
-set -e
+#!/bin/bash -e
+. /opt/bitnami/base/functions
 
-# Set default values
-export MARIADB_USER=${MARIADB_USER:-"root"}
-export MARIADB_HOST=${MARIADB_HOST:-"mariadb"}
-export MARIADB_PORT=${MARIADB_PORT:-"3306"}
-export CODEIGNITER_PROJECT_NAME=${CODEIGNITER_PROJECT_NAME:-"myapp"}
+print_welcome_page
+check_for_updates &
 
 PROJECT_DIRECTORY=/app/$CODEIGNITER_PROJECT_NAME
 DEPLOY="$@"
 
-log () {
-    echo -e "\033[0;33m$(date "+%H:%M:%S")\033[0;37m ==> $1."
-}
-
 nami restart mariadb
 echo "Starting application ..."
 
@@ -29,4 +22,4 @@ if [ "$1" == "php" -a "$2" == "-S" ] ; then
   DEPLOY="$@ -t $PROJECT_DIRECTORY"
 fi
 
-exec /entrypoint.sh $DEPLOY
+exec tini -- $DEPLOY