From 23b669b731613f4cfb972a2586dfa2b57535d41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 2 Jul 2015 23:28:25 +0200 Subject: [PATCH] fix some installation steps --- .../install_additional_bundles.rst | 7 +++-- source/installation/installation.rst | 28 ++++++------------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/source/installation/install_additional_bundles.rst b/source/installation/install_additional_bundles.rst index a40bf7575..3af11fe6e 100644 --- a/source/installation/install_additional_bundles.rst +++ b/source/installation/install_additional_bundles.rst @@ -21,7 +21,8 @@ A basic installation of Chill include four bundles: but you can add as many as needed by your project, and if the bundle does not exists yet, you can create a new one, see :ref:`create-new-bundle` . In Chill you are free to do what is most suitable for your activity, so let's go into details on how to add an existing bundle. -We will add the bundle 'icpc2' that does something very important... + +We will add the bundle 'icpc2' that set `icpc code `_ available as custom field. .. todo:: Add description of the bundle @@ -45,5 +46,5 @@ So just do it: .. note:: The following has to be automated: - Finally we should modify the AppKernel.php file adding 'new Chill\Icpc2Bundle\ChillIcpc2Bundle(),' in the $bundle array. - \ No newline at end of file + Finally we should modify the AppKernel.php file adding `new Chill\\Icpc2Bundle\\ChillIcpc2Bundle(),` in the $bundle array as described `in the symfony documentation `_. + diff --git a/source/installation/installation.rst b/source/installation/installation.rst index fe4b90ae4..21a88282e 100644 --- a/source/installation/installation.rst +++ b/source/installation/installation.rst @@ -60,6 +60,7 @@ Install composer globally on you system will made the installation process easie .. code-block:: bash sudo mv composer.phar /usr/local/bin/composer + sudo chmod +x /usr/local/bin/composer You can test the installation by running `which composer` or `composer`: those command should not raise any error. @@ -79,7 +80,8 @@ Once docker is installed, run : sudo docker run -P --name=chill_db chill/database This will download the chill/database image and start a new docker instance with the name `chill_db` and export the postgresql port `5432` on another random local port. -You can exit from the terminal and check if the docker database is running with the following command: + +The db will start in your terminal. In another terminal, you can check if the docker database is running and showing the exposed port with the following command: .. code-block:: bash @@ -88,7 +90,7 @@ You can exit from the terminal and check if the docker database is running with >>>> CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES >>>> 08bbb62bd5e8 chill/database "/docker-entrypoint. 6 days ago Up 5 hours 0.0.0.0:32768->5432/tcp chill_db -If the response does not show up 'chill_db', you can start and stop it via: +You can start and stop the container it via: .. code-block:: bash @@ -223,31 +225,19 @@ The main bundle require two scripts to be executed : .. code-block:: bash php app/console doctrine:fixtures:load - php app/console chill:main:countries:populate - php app/console chill:main:languages:populate Those will populate database, respectively, with basic dummy data, countries (using ISO declaration) and languages (using, also, ISO informations). -Building CSS (optional) -^^^^^^^^^^^^^^^^^^^^^^^ - -For this step, npm must be installed. - -A build version of the needed CSS file is provided within the main bundle `Resources/public/css/chillmain.css`. For rebuilding it : +Preparing assets +^^^^^^^^^^^^^^^^ +You have to dump assets into the web directory. Even if the command should be run by Composer, you may run it manually : .. code-block:: bash - #in the main bundle directory ( vendor/chill-project/main/ ) - cd vendor/chill-project/main/Resources/ - npm install grunt - -Go back to your project root before doing next step - -.. code-block:: bash - - cd path/to/your/directory + php app/console assetic:dump + php app/console assets:install Launch your server