Improved dockerfile and entrypoint

This commit is contained in:
dgonzalez 2016-08-31 16:41:47 +02:00
parent 5f65b4b3c3
commit 34e6474709
2 changed files with 4 additions and 11 deletions

View File

@ -19,12 +19,10 @@ RUN bitnami-pkg install mysql-client-10.1.13-4 --checksum 14b45c91dd78b37f0f2366
RUN bitnami-pkg install mariadb-10.1.14-4 --checksum 4a75f4f52587853d69860662626c64a4540126962cd9ee9722af58a3e7cfa01b
# Install Codeigniter module
RUN bitnami-pkg install codeigniter-3.1.0-0 --checksum 6ab5915956daab8686e48a0eb5b18155b9da2e1e46d1c4d2008d760702ec86c3
#RUN bitnami-pkg install codeigniter-3.1.0-0 --checksum 058d6a29ae1d4e612ad061575c166df16a641a5414b4404c33bf46125355e21a
EXPOSE 8000
USER bitnami
WORKDIR /app
COPY rootfs /

View File

@ -5,27 +5,23 @@ set -e
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:-"appasd_template"}
export CODEIGNITER_PROJECT_NAME=${CODEIGNITER_PROJECT_NAME:-"app_template"}
PROJECT_DIRECTORY=/app/$CODEIGNITER_PROJECT_NAME
DEPLOY="$@"
OLDHOME=$HOME
HOME=/root
log () {
echo -e "\033[0;33m$(date "+%H:%M:%S")\033[0;37m ==> $1."
}
sudo harpoon restart mariadb
harpoon restart mariadb
echo "Starting application ..."
if [ "$1" == "php" -a "$2" == "-S" ] ; then
if [ ! -d $PROJECT_DIRECTORY ] ; then
log "Creating example Codeigniter application"
cd /app
sudo harpoon execute codeigniter createProject $CODEIGNITER_PROJECT_NAME
harpoon execute codeigniter createProject $CODEIGNITER_PROJECT_NAME
log "Codeigniter app created"
cd $CODEIGNITER_PROJECT_NAME
else
log "App already created"
cd $PROJECT_DIRECTORY
@ -33,5 +29,4 @@ if [ "$1" == "php" -a "$2" == "-S" ] ; then
DEPLOY="$@ -t $PROJECT_DIRECTORY"
fi
HOME=$OLDHOME
exec /entrypoint.sh $DEPLOY