diff --git a/bitnami/symfony/Dockerfile b/bitnami/symfony/Dockerfile index f09482a282c4..7d5c8f3c95e5 100644 --- a/bitnami/symfony/Dockerfile +++ b/bitnami/symfony/Dockerfile @@ -1,17 +1,17 @@ ## BUILDING ## (from project root directory) -## $ docker build -t bitnami/bitnami-docker-javaplay . +## $ docker build -t bitnami/bitnami-docker-symfony . ## ## RUNNING -## $ docker run -p 9000:9000 bitnami/bitnaxmi-docker-javaplay +## $ docker run -p 8000:8000 bitnami/bitnami-docker-symfony FROM gcr.io/stacksmith-images/ubuntu:14.04-r8 MAINTAINER Bitnami ENV BITNAMI_APP_NAME=symfony \ - BITNAMI_APP_VERSION=2.8.9 \ - PATH=/opt/bitnami/symfony/bin:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin/:$PATH + BITNAMI_APP_VERSION=3.1.3 \ + PATH=/opt/bitnami/symfony:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin/:$PATH # Additional modules required RUN bitnami-pkg install php-7.0.10-0 --checksum 5f2ec47fcfb2fec5197af6760c5053dd5dee8084d70a488fd5ea77bd4245c6b9 @@ -21,14 +21,13 @@ ENV PATH=/opt/bitnami/mysql/bin:$PATH RUN bitnami-pkg install mariadb-10.1.14-4 --checksum 4a75f4f52587853d69860662626c64a4540126962cd9ee9722af58a3e7cfa01b # Install symfony -RUN bitnami-pkg install symfony-2.8.9-0 --checksum e14979a9ed1a332bdd709ecc997ccc1ba7be0c680818e69ad5671ef0776df84e -ENV PATH=/opt/bitnami/symfony:$PATH +RUN bitnami-pkg unpack symfony-2.8.9-0 --checksum e14979a9ed1a332bdd709ecc997ccc1ba7be0c680818e69ad5671ef0776df84e COPY rootfs / VOLUME ["/app"] -EXPOSE 9000 +EXPOSE 8000 WORKDIR /app @@ -38,4 +37,4 @@ ENV TERM=xterm ENTRYPOINT ["/app-entrypoint.sh"] -CMD ["php", "-S", "0.0.0.0:9000"] +CMD ["php", "-S", "0.0.0.0:8000"] diff --git a/bitnami/symfony/docker-compose.yml b/bitnami/symfony/docker-compose.yml index 4c3115589e0e..0e30226cccac 100644 --- a/bitnami/symfony/docker-compose.yml +++ b/bitnami/symfony/docker-compose.yml @@ -1,8 +1,8 @@ version: '2' services: myapp: - build: . + image: bitnami/symfony ports: - - '9000:9000' + - '8000:8000' volumes: - '.:/app' diff --git a/bitnami/symfony/rootfs/app-entrypoint.sh b/bitnami/symfony/rootfs/app-entrypoint.sh index bbad84435eca..65e0bda55bb7 100755 --- a/bitnami/symfony/rootfs/app-entrypoint.sh +++ b/bitnami/symfony/rootfs/app-entrypoint.sh @@ -5,23 +5,26 @@ set -e export MARIADB_USER=${MARIADB_USER:-"root"} export MARIADB_HOST=${MARIADB_HOST:-"mariadb"} export MARIADB_PORT=${MARIADB_PORT:-"3306"} -export SYMFONY_PROJECT_NAME=${SYMFONY_PROJECT_NAME:-"appasd_template"} +export SYMFONY_PROJECT_NAME=${SYMFONY_PROJECT_NAME:-"app_template"} PROJECT_DIRECTORY=/app/$SYMFONY_PROJECT_NAME +DEPLOY="$@" +OLDHOME=$HOME +HOME=/root log () { echo -e "\033[0;33m$(date "+%H:%M:%S")\033[0;37m ==> $1." } -sudo -i harpoon restart mariadb +sudo harpoon restart mariadb echo "Starting application ..." if [ "$1" == "php" -a "$2" == "-S" ] ; then if [ ! -d $PROJECT_DIRECTORY ] ; then - harpoon initialize symfony --inputs-file=/symfony-inputs.json + sudo harpoon initialize symfony --inputs-file=/symfony-inputs.json log "Creating example Symfony application" cd /app - harpoon execute symfony createProject $SYMFONY_PROJECT_NAME + sudo harpoon execute symfony createProject $SYMFONY_PROJECT_NAME log "Symfony app created" cd $SYMFONY_PROJECT_NAME else @@ -29,10 +32,10 @@ if [ "$1" == "php" -a "$2" == "-S" ] ; then cd $PROJECT_DIRECTORY fi if [ ! -f $PROJECT_DIRECTORY/web/index.php ] ; then - ln -s $PROJECT_DIRECTORY/web/app.php $PROJECT_DIRECTORY/web/index.php + sudo ln -s $PROJECT_DIRECTORY/web/app.php $PROJECT_DIRECTORY/web/index.php fi - exec /entrypoint.sh "$@" -t $PROJECT_DIRECTORY/web + DEPLOY="$@ -t $PROJECT_DIRECTORY/web/" fi - -exec "$@" +HOME=$OLDHOME +exec /entrypoint.sh $DEPLOY