From afe94d06500f90bb3dd101d5a2c61273eed9256f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez?= Date: Tue, 27 Dec 2016 12:36:14 +0100 Subject: [PATCH] Bump image version to 3.2.1-r0 (#31) * Bump image version to 3.2.1-r0 --- bitnami/symfony/Dockerfile | 15 +++++++++------ bitnami/symfony/README.md | 19 +++++++++---------- bitnami/symfony/rootfs/app-entrypoint.sh | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/bitnami/symfony/Dockerfile b/bitnami/symfony/Dockerfile index 936b43a81bb0..04193b240240 100644 --- a/bitnami/symfony/Dockerfile +++ b/bitnami/symfony/Dockerfile @@ -10,16 +10,19 @@ FROM gcr.io/stacksmith-images/minideb:jessie-r7 MAINTAINER Bitnami ENV BITNAMI_APP_NAME=symfony \ - BITNAMI_IMAGE_VERSION=3.1.3-r6 \ - PATH=/opt/bitnami/symfony:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin/:$PATH + BITNAMI_IMAGE_VERSION=3.2.1-r0 \ + PATH=/opt/bitnami/symfony/bin:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin/:$PATH + +# System packages required +RUN install_packages libc6 zlib1g libxslt1.1 libtidy-0.99-0 libreadline6 libncurses5 libtinfo5 libsybdb5 libmcrypt4 libldap-2.4-2 libstdc++6 libgmp10 libpng12-0 libjpeg62-turbo libbz2-1.0 libxml2 libssl1.0.0 libcurl3 libfreetype6 libicu52 libgcc1 libgcrypt20 libgssapi-krb5-2 libgnutls-deb0-28 libsasl2-2 liblzma5 libidn11 librtmp1 libssh2-1 libkrb5-3 libk5crypto3 libcomerr2 libgpg-error0 libkrb5support0 libkeyutils1 libp11-kit0 libtasn1-6 libnettle4 libhogweed2 libffi6 libaio1 libjemalloc1 # Additional modules required -RUN bitnami-pkg install php-7.0.11-1 --checksum cc9129523269e86728eb81ac489c65996214f22c6447bbff4c2306ec4be3c871 -RUN bitnami-pkg install mysql-client-10.1.19-0 --checksum fdbc292bedabeaf0148d66770b8aa0ab88012ce67b459d6ba2b46446c91bb79c -RUN bitnami-pkg install mariadb-10.1.19-0 --checksum c54e3fdc689cdd2f2119914e4f255722f96f1d7fef37a064fd46fb84b013da7b +RUN bitnami-pkg install php-7.0.14-0 --checksum 9144f590d0cbbf751288c27467128b5f95507729c22144008c453c94cd8ef8b9 +RUN bitnami-pkg install mysql-client-10.1.20-0 --checksum 14d20929072b157b5e819deb440504ad0f33f583493b5adeb283c329ea58d513 +RUN bitnami-pkg install mariadb-10.1.20-0 --checksum 7409ba139885bc4f463233a250806f557ee41472e2c88213e82c21f4d97a77d7 # Install symfony -RUN bitnami-pkg install symfony-3.1.3-1 --checksum 35c1c89157ff9d527a9644a4bd1d07ab00f2c3c12dad41cc45f9913a1d3ddbfa +RUN bitnami-pkg unpack symfony-3.2.1-0 --checksum 9b619d616f09f76b16bbbd115d53ca2ead9ea22118ba7db45ac0b202325962e1 COPY rootfs / diff --git a/bitnami/symfony/README.md b/bitnami/symfony/README.md index 715a28693c9d..dbc638c50e8f 100644 --- a/bitnami/symfony/README.md +++ b/bitnami/symfony/README.md @@ -15,7 +15,7 @@ $ docker-compose up ### Eclipse Che workspace -Launch a on-demand Symfony development workspace in Eclipse Che by clicking the link below: +Launch an on-demand Symfony development workspace in Eclipse Che by clicking the link below: [![Symfony Development Workspace](http://beta.codenvy.com/factory/resources/codenvy-contribute.svg)](https://beta.codenvy.com/f/?url=https%3A%2F%2Fgithub.com%2Fbitnami%2Fbitnami-docker-symfony%2Ftree%2Fche) @@ -36,8 +36,8 @@ The quickest way to get started with the Bitnami Symfony Development Container i Begin by creating a directory for your Symfony application: ```bash -mkdir ~/myapp -cd ~/myapp +$ mkdir ~/myapp +$ cd ~/myapp ``` Download the [docker-compose.yml](https://raw.githubusercontent.com/bitnami/bitnami-docker-symfony/master/docker-compose.yml) file in the application directory: @@ -69,8 +69,7 @@ The general structure of the `exec` command is: ```bash $ docker-compose exec ``` - -, where `` is the name of the container service as described in the `docker-compose.yml` file and `` is the command you want to launch inside the service. +where `` is the name of the container service as described in the `docker-compose.yml` file and `` is the command you want to launch inside the service. Following are a few examples: @@ -92,10 +91,10 @@ Following are a few examples: If you encountered a problem running this container, you can file an [issue](../../issues/new). For us to provide better support, be sure to include the following information in your issue: -- Host OS and version (`uname -a`) -- Docker version (`docker version`) -- Docker info (`docker info`) -- Docker image version (`echo $BITNAMI_IMAGE_VERSION` inside the container) +- Host OS and version (`$ uname -a`) +- Docker version (`$ docker version`) +- Docker info (`$ docker info`) +- Docker image version (`$ echo $BITNAMI_IMAGE_VERSION` inside the container) - Steps to reproduce the issue. ## License @@ -106,7 +105,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/bitnami/symfony/rootfs/app-entrypoint.sh b/bitnami/symfony/rootfs/app-entrypoint.sh index 9331ef1500ca..30b3afaca12f 100755 --- a/bitnami/symfony/rootfs/app-entrypoint.sh +++ b/bitnami/symfony/rootfs/app-entrypoint.sh @@ -11,20 +11,20 @@ PROJECT_DIRECTORY=/app/$SYMFONY_PROJECT_NAME DEPLOY="$@" log () { - echo -e "\033[0;33m$(date "+%H:%M:%S")\033[0;37m ==> $1." + echo -e "\033[0;33m$(date "+%H:%M:%S")\033[0;37m ==> $1." } nami restart mariadb echo "Starting application ..." if [ "$1" == "php" -a "$2" == "-S" ] ; then - if [ ! -d $PROJECT_DIRECTORY ] ; then - log "Creating example Symfony application" - nami execute symfony createProject $SYMFONY_PROJECT_NAME | grep -v undefined - log "Symfony app created" - else - log "App already created" - fi + if [ ! -d $PROJECT_DIRECTORY ] ; then + log "Creating example Symfony application" + nami execute symfony createProject $SYMFONY_PROJECT_NAME | grep -v undefined + log "Symfony app created" + else + log "App already created" + fi if [ ! -f $PROJECT_DIRECTORY/web/index.php ] ; then sudo ln -s $PROJECT_DIRECTORY/web/app.php $PROJECT_DIRECTORY/web/index.php fi