Codestin Search App

HeahDude · 2017-01-11T14:55:34Z

wait for MariaDB to be ready
update the doc
fixes the assets task (build the assets)
check if the virtual host is not broken

hhamon · 2017-01-11T14:56:52Z


+db:
+    $(CONSOLE) doctrine:database:create --if-not-exists
+    - $(CONSOLE) doctrine:schema:create


C'est quoi le signe moins ?

It continues the script on error.

hhamon · 2017-01-11T14:57:55Z

 lancez simplement ``make boot`` à la racine du projet ou la commande `docker-compose up -d`.
-Cela créera un serveur MariaDB accessible sur le port 3306 de votre machine (si vous êtes sous Mac OS ou Windows,
-vous aurez besoin de travailler avec l'IP de votre machine virtuelle).
+Cela créera un serveur apache accessible sur le port 8080 (que vous pouvez personnaliser dans


s/apache/Apache/

Nice catch, thx!

hhamon · 2017-01-11T14:58:18Z

+machine (si vous êtes sous Mac OS ou Windows, vous aurez besoin de travailler avec l'IP de votre
+machine virtuelle).

 Si vous utilisez Docker, la base de donnée sera configurée automatiquement.


s/donnée/données/

hhamon · 2017-01-11T14:59:03Z

            ->add('lastName', TextType::class)
-            ->add('emailAddress', EmailType::class)
+            ->add('emailAddress', EmailType::class, [
+                'empty_data' => '',


Bug fix, it activates the transformer null => '', see symfony/symfony#18357 :)

not needed IMO =) (https://github.com/EnMarche/en-marche.fr/pull/80/files#r95741608)

hhamon · 2017-01-11T14:59:14Z

        $this->gender = Genders::MALE;
        $this->position = ActivityPositions::EMPLOYED;
        $this->conditions = false;
+        $this->emailAddress = '';


Bug fix when submitting null, prevents a fatal error.

please edit the function signature to be consistent with the rest of code.

tgalopin · 2017-01-11T16:20:40Z

 use Symfony\Component\Debug\Debug;

-if (isset($_SERVER['HTTP_CLIENT_IP']) || isset($_SERVER['HTTP_X_FORWARDED_FOR']) || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1']) || php_sapi_name() === 'cli-server')) {
+if ('docker' !== getenv('SYMFONY_ENV') && (isset($_SERVER['HTTP_CLIENT_IP']) || isset($_SERVER['HTTP_X_FORWARDED_FOR']) || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1']) || php_sapi_name() === 'cli-server'))) {


SYMFONY_ENV is usually a reference to a Symfony environment, and the docker environment is not a valid Symfony environment. I think we should use a different env var name.

@tgalopin Fair enough, what about DOCKER_ENV=1?

Fixed

HeahDude · 2017-01-11T17:03:52Z

@hhamon Final review? :)

HeahDude

Needs work here. I should upgrade the readme to explain more how to launch the server.

HeahDude · 2017-01-12T07:28:45Z

-all: boot install assets run
+.PHONY: clean
+
+all: boot install db assets run


run is broken with Docker.

then keep bin/console server:run

salahm · 2017-01-12T08:18:47Z

+            - "3306:3306"
+
+    mailcatcher:
+        ports:


do you really need to override this ?

Mailcatcher can be removed, we are using mailjet directly without SMTP.

salahm · 2017-01-12T08:20:18Z

+
    mysql:
        image: mariadb
-        environment:


why did you remove these default values ? there is no gain to put them in the override file.

salahm · 2017-01-12T08:21:20Z

    mailcatcher:
        image: schickling/mailcatcher
-        ports:
-            - "9025:1025"


same here.

actually your docker-compose env, should be able to run without the override file. the override file will be used only by devs who want to tweak some stuffs

salahm · 2017-01-12T08:24:39Z

        $this->gender = Genders::MALE;
        $this->position = ActivityPositions::EMPLOYED;
        $this->conditions = false;
+        $this->emailAddress = '';


please edit the function signature to be consistent with the rest of code.

salahm · 2017-01-12T08:24:48Z

 use Symfony\Component\Debug\Debug;

-if (isset($_SERVER['HTTP_CLIENT_IP']) || isset($_SERVER['HTTP_X_FORWARDED_FOR']) || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1']) || php_sapi_name() === 'cli-server')) {
+if ('1' != getenv('DOCKER_ENV') && (isset($_SERVER['HTTP_CLIENT_IP']) || isset($_SERVER['HTTP_X_FORWARDED_FOR']) || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1']) || php_sapi_name() === 'cli-server'))) {


salahm · 2017-01-12T08:27:41Z

            ->add('lastName', TextType::class)
-            ->add('emailAddress', EmailType::class)
+            ->add('emailAddress', EmailType::class, [
+                'empty_data' => '',


not needed IMO =) (https://github.com/EnMarche/en-marche.fr/pull/80/files#r95741608)

ghost · 2017-01-19T17:43:11Z

I've just updated this PR. Still need to do :

~~wait for MariaDB to be ready~~
~~update the doc~~
~~fixes the assets task (build the assets)~~
check if the virtual host is not broken
improves phpMyAdmin if needed (check how it works)

HeahDude · 2017-01-19T21:18:00Z

+	$(CONSOLE) cache:clear --no-warmup
+	$(CONSOLE) cache:clear --no-warmup --env=prod
+	$(CONSOLE) cache:clear --no-warmup --env=test
+	$(APP) rm -rf var/logs/*


This deletes .gitkeep files :/

I don't think, rm don't touch dotfiles

HeahDude · 2017-01-19T21:18:34Z

@@ -19,8 +21,8 @@ services:

    mailcatcher:


missing a rebase on master

HeahDude · 2017-01-19T21:19:21Z

 ou

- PHP 7.0+
+- PHP 7.1+


To be reverted.

Ok but maybe it's not a good idea to develop on 7.1 if we are requiring only 7.0?

https://github.com/EnMarche/en-marche.fr/blob/master/docker/tools/Dockerfile#L1

So? Go for 7.0 or 7.1?

Go 7.0 for now

HeahDude · 2017-01-19T21:24:52Z

+
+ou
+
+- PHP 7.1+


Should be 7.0 to be iso prod.

HeahDude · 2017-01-20T17:14:17Z

LGTM 👍, thanks @romain-pierre :)

tgalopin · 2017-01-20T19:56:19Z

-/app/data/images/*
-!/app/data/images
-!/app/data/images/.gitkeep
+/app/data/images/


Why remove the gitkeep? I like to be able to understand the directory structure of the project in git. This is true for the other directories like this one.

It's just because using ! sign have no effect on the files already added in the Git index. I prefer to ignore an entire folder and manually add the .gitkeep file in the index (ie: added by force, regardless of the ignore list).

By this way, the folder and it's contents will always be ignored AND the folder will be created thanks to the .gitkeep file AND there is no useless line in the gitignore.

Fair enough

tgalopin · 2017-01-20T20:02:29Z

+            - "3306:3306"
+
+    mailcatcher:
+        ports:


Mailcatcher can be removed, we are using mailjet directly without SMTP.

tgalopin · 2017-01-24T19:33:07Z

+            - db
+        volumes:
+            - .:/var/www
+            - /var/www/var/cache


Hum, why put this and the sessions as a volume?

This is an exclusion rule.

tgalopin · 2017-01-24T19:36:09Z

+
+    <Directory /var/www/web>
+        Require all granted
+        DirectoryIndex app.php


C'est pas app_dev.php ?

Like you want, but personally I prefer to have the production bootstrap script when the user request http://127.0.0.1/ and manually specify http://127.0.0.1/app_dev.php/ for development.

Please note that are the Symfony Standard htaccess rules.

I prefer app_dev.php if you can change this, just to be easier for the newcomers.

tgalopin · 2017-01-24T19:37:24Z

@@ -1,65 +0,0 @@
-daemon off;


Il faut pas supprimer ca, c'est utilisé pour la preprod.

Ok, I will revert, but if we switch back to nginx in the future, this file will be located in a sub-folder (probably /docker/web/nginx.conf) to have a clear config.

I'll work on this PR tonight.

I've just updated. I will post some comments on the /Dockerfile.

ghost · 2017-01-24T20:19:32Z

For the Dockerfile (the production one):

I suggest to not use the alpine edition (built on a special glibc that we may not trust)
You can avoid to set permissions on chmod a+x /usr/local/bin/run.sh if you set the permissions on your local computer and commit the chmod with Git.
If you copy the entire project in the image, it's useless to copy the config file: just move them in the RUN section

tgalopin · 2017-01-24T20:21:00Z

That's true, I'm working on a new ubuntu 16.04 image, and I'll take your ideas into account.

tgalopin · 2017-01-25T00:33:18Z

I changed quite a lot of things:

I created 3 Docker files: prod.dockerfile, dev.dockerfile and tools.dockerfile, all based on ubuntu 16.04
I installed in these images PHP 7.1: we can start to code using it
The docker set-up will from now on be the only supported development environment: I will remove the documentation about server:run and I will explain in more details how to use the Makefile

ghost · 2017-01-25T10:32:15Z

 ifdef DOCKER
-    APP=docker-compose exec -T app
-    TOOLS=docker-compose run --rm tools
+    APP=sudo docker-compose exec -T app


sudo is not required on every platforms for this command to works: on linux, user may be added in the docker group. And macOS not needs privilege elevation at all.

It's a "hard to resolve" point...

HeahDude · 2017-01-25T10:39:08Z

+        php7.1-zip \
+        supervisor \
+        tzdata \
+        wget && \


Can you please add graphviz? We may need it to dump workflows as dot files.

HeahDude · 2017-01-25T11:25:47Z

👍

* Added a docker container for the application * Finalize Dockerized app

HeahDude added Amélioration Bug Ready for code review labels Jan 11, 2017

HeahDude self-assigned this Jan 11, 2017

HeahDude requested review from hhamon and tgalopin January 11, 2017 14:55

hhamon reviewed Jan 11, 2017

View reviewed changes

HeahDude force-pushed the docker-app branch 5 times, most recently from 748da40 to dab2b56 Compare January 11, 2017 16:00

tgalopin previously requested changes Jan 11, 2017

View reviewed changes

HeahDude force-pushed the docker-app branch from dab2b56 to 87d382e Compare January 11, 2017 17:03

HeahDude mentioned this pull request Jan 11, 2017

Redirected new adherent to donation page #82

Merged

HeahDude commented Jan 12, 2017

View reviewed changes

salahm reviewed Jan 12, 2017

View reviewed changes

HeahDude force-pushed the docker-app branch from 87d382e to 3bb5073 Compare January 17, 2017 17:23

HeahDude added Work in progress and removed Bug Ready for code review labels Jan 18, 2017

ghost closed this Jan 19, 2017

ghost reopened this Jan 19, 2017

HeahDude commented Jan 19, 2017

View reviewed changes

ghost force-pushed the docker-app branch from 3dfaded to 40c07b2 Compare January 20, 2017 16:13

tgalopin suggested changes Jan 20, 2017

View reviewed changes

ghost force-pushed the docker-app branch 3 times, most recently from d051c2d to 88b6303 Compare January 24, 2017 17:42

tgalopin reviewed Jan 24, 2017

View reviewed changes

ghost force-pushed the docker-app branch from 88b6303 to 9c0bd15 Compare January 24, 2017 20:01

Added a docker container for the application

e8f7945

ghost force-pushed the docker-app branch from 9c0bd15 to e8f7945 Compare January 24, 2017 20:03

tgalopin approved these changes Jan 25, 2017

View reviewed changes

tgalopin force-pushed the docker-app branch from dce7f91 to 5e5ca1f Compare January 25, 2017 00:31

ghost reviewed Jan 25, 2017

View reviewed changes

HeahDude commented Jan 25, 2017

View reviewed changes

tgalopin force-pushed the docker-app branch 2 times, most recently from 51c664b to 25f27fc Compare January 25, 2017 10:42

Finalize Dockerized app

802db70

tgalopin force-pushed the docker-app branch from 25f27fc to 802db70 Compare January 25, 2017 12:06

tgalopin merged commit 36e1b28 into master Jan 25, 2017

tgalopin pushed a commit that referenced this pull request Jan 26, 2017

Full docker app (#80)

7a06571

* Added a docker container for the application * Finalize Dockerized app

tgalopin deleted the docker-app branch January 27, 2017 20:52

tgalopin restored the docker-app branch January 27, 2017 20:52

tgalopin deleted the docker-app branch January 27, 2017 20:52

csauvage pushed a commit to csauvage/en-marche.fr that referenced this pull request Feb 13, 2017

Full docker app (parti-renaissance#80)

154b620

* Added a docker container for the application * Finalize Dockerized app

Uh oh!

Conversation

HeahDude commented Jan 11, 2017 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

HeahDude commented Jan 11, 2017

Uh oh!

HeahDude left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ghost commented Jan 19, 2017 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

HeahDude commented Jan 11, 2017 •

edited by ghost

Loading

ghost commented Jan 19, 2017 •

edited by ghost

Loading

tgalopin Jan 24, 2017 •

edited

Loading

ghost Jan 24, 2017 •

edited by ghost

Loading