Revize b332d98a

Re #7986 devops refactor

.docker-compose-dev.yml

@@ -1 @@
-version: "3.2"
-services:
-       py-charm:
-                build:
-                        context: ./python-module
-                        dockerfile: '../build/php-fpm/dev/Dockerfile'
-                ports: 
-                        - "9001:9000"
-                volumes: 
-                        - ./python-module:/var/python-module
- 
-                container_name: "heatmap_py_charm"
-       php-fpm:
-               build: ./build/php-fpm/dev/
-               depends_on: 
-                       - database
-               networks:
-                   - backend
-               ports: 
-                       - "9000:9000"
-               volumes:
-                       - ./website/:/var/www/symfony
-                       - ./python-module:/var/python-module
-               container_name: "heatmap_php_fpm"
-               environment:
-                       XDEBUG_CONFIG: remote_host=172.17.0.1 #your docker network i TODO:NOT WORKING
-       nginx:
-               build: './build/nginx'
-               depends_on:
-                       - php-fpm
-                       - database
-               networks:
-                       - frontend
-                       - backend
-               ports:
-                       - "80:80"
-               volumes:
-                       - ./logs/nginx:/var/log/nginx
-                       - ./website/:/var/www/symfony
-               container_name: "heatmap_nginx"
-       database:
-               image: 'mongo'
-               container_name: "heatmap_mongodb"
-               restart: always
-               networks:
-                       - backend
-               ports:
-                       - '27017-27019:27017-27019'
-              
-               environment:
-                       MONGO_INITDB_DATABASE: open-data-db
-                       MONGO_INITDB_ROOT_USERNAME: root
-                       MONGO_INITDB_ROOT_PASSWORD: root
-               volumes:
-                        - data-db:/data/db
-                        - ./dev-dump:/dev-dump
-                        
-volumes:
-    data-db:
-    
-networks:
-       frontend:
-       backend:

.gitignore

@@ -3 +3 @@
 .idea
 dev-dump
 *.lock
+.vscode-server

.vscode/extensions.json

@@ +1 @@
+{
+    "recommendations": [
+        "ms-vscode-remote.remote-containers"
+    ]
+
+}

README.md

@@ -24 +24 @@
 * First you need to set python interpeter to the containers by **following these steps**
 <div style="display: flex; flex-direction: row; justify-content: space-around;flex-wrap: wrap">
   <div style="height: 450px; display: flex; justify-content: space-between;flex-direction: column;">
-  <img src="./guide/1.png" width="500px" style="display: block"/>
+  <img src="./doc/images/1.png" width="500px" style="display: block"/>
   <p style="background: red">A. Enter Settings (File/Preferences/Settings)</p>
   </div>
   <div style="height: 450px; display: flex; justify-content: space-between; flex-direction: column;">
-  <img src="./guide/2.png" width="500px" height="360px" style="display: block"/>
+  <img src="./doc/images/2.png" width="500px" height="360px" style="display: block"/>
   <p style="background: red">B. In the left panel choose <b>Docker</b> and in <b>Image Name</b> choose <b>heatmap_py-charm</b></p>
   </div>
   <div style="height: 450px; display: flex; justify-content: space-between;flex-direction: column;">
-  <img src="./guide/3.png" width="500px" style="display: block"/>
+  <img src="./doc/images/3.png" width="500px" style="display: block"/>
   <p style="background: red">C. When setup is ok you will see all packages from requirements on this screen</b></p>
   </div>
 </div>

build/nginx/Dockerfile

@@ -1 @@
-FROM nginx:alpine
-COPY nginx.conf /etc/nginx
-COPY conf.d /etc/nginx/conf.d
-ADD ./sites /etc/nginx/sites-available
-WORKDIR /var/www/
-CMD ["nginx"]

build/nginx/conf.d/default.conf

@@ -1 @@
-upstream php-upstream {
-    server php-fpm:9000;
-}

build/nginx/nginx.conf

@@ -1 @@
-user  nginx;
-worker_processes  4;
-daemon off;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-    access_log  /var/log/nginx/access.log;
-    sendfile        on;
-    keepalive_timeout  65;
-
-    include /etc/nginx/conf.d/*.conf;
-    include /etc/nginx/sites-available/*.conf;
-}

build/nginx/sites/default.conf

@@ -1 @@
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server ipv6only=on;
-
-    server_name localhost;
-    root /var/www/symfony/public;
-    index index.php index.html index.htm;
-
-    location / {
-         try_files $uri $uri/ /index.php$is_args$args;
-    }
-
-    location ~ \.php$ {
-        try_files $uri /index.php =404;
-        fastcgi_pass php-upstream;
-        fastcgi_index index.php;
-        fastcgi_buffers 16 16k;
-        fastcgi_buffer_size 32k;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_read_timeout 600;
-        include fastcgi_params;
-    }
-
-    location ~ /\.ht {
-        deny all;
-    }
-}

build/php-fpm/Dockerfile

@@ -1 @@
-FROM php:7.4-fpm-alpine
-RUN apk update; \
-	apk upgrade; \
-	apk add autoconf openssl-dev g++ make && \
-    echo "**** install MongoDB ****\n" && \
-	pecl install mongodb && \
-	docker-php-ext-enable mongodb; \
-	apk del --purge autoconf openssl-dev g++ make;
-RUN echo "**** install Python ****\n" && \
-    apk add --no-cache python3 && \
-    if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python ; fi && \
-    \
-    echo "**** install pip ****\n" && \
-    python3 -m ensurepip && \
-    rm -r /usr/lib/python*/ensurepip && \
-    pip3 install --no-cache --upgrade pip setuptools wheel && \
-    if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi
-RUN echo "**** install PHP Composer ****\n" && \
-    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer

build/php-fpm/dev/Dockerfile

@@ -1 @@
-#DEV ONLY DOCKERFILE
-FROM php:7.4-fpm-alpine
-RUN apk update; \
-	apk upgrade; \
-	apk add autoconf openssl-dev g++ make && \
-	pecl install mongodb && \
-	docker-php-ext-enable mongodb; \
-	apk del --purge autoconf openssl-dev g++ make;
-
-RUN echo "**** install Python ****" && \
-    apk add --no-cache python3 && \
-    if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python ; fi && \
-    \
-    echo "**** install pip ****" && \
-    python3 -m ensurepip && \
-    rm -r /usr/lib/python*/ensurepip && \
-    pip3 install --no-cache --upgrade pip setuptools wheel && \
-    if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi
-RUN echo "**** install PHP Composer ****\n" && \
-    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer
-COPY requirements.txt /requirements.txt
-RUN pip install -r /requirements.txt

build/php-fpm/dev/xdebug.ini

@@ -1 @@
-[XDebug]
-xdebug.remote_enable=1
-xdebug.remote_autostart=1
-xdebug.remote_handler=dbgp
-xdebug.remote_port=9000
-xdebug.remote_connect_back=0

docker-compose-dev.yml

@@ +1 @@
+version: "3.2"
+services:
+       php-fpm:
+               build: './docker/php-fpm/dev'
+               volumes:
+                        - vscode-extensions-php:/var/www/symfony/.vscode-server/extensions
+                        - ./logs/xdebug:/var/www/symfony/xdebug
+       crawler:
+               volumes: 
+                        - vscode-extensions-crawler:/src/.vscode-server/extensions
+       database:
+               volumes:
+                        - data-db:/data/db
+                        - ./dev-dump:/dev-dump
+volumes:
+    data-db:
+    vscode-extensions-php:
+    vscode-extensions-crawler:

docker-compose-prod.yml

@@ +1 @@
+version: "3.2"
+services:
+       database:
+               volumes:
+                        - /database:/data/db

docker-compose.yml

@@ -1 +1 @@
 version: "3.2"
 services:
+       crawler:
+                build: 
+                        context: ./modules/crawler
+                        dockerfile: ../../docker/crawler/Dockerfile
+
+                depends_on: 
+                        - database
+                networks:
+                        - backend
+                volumes:
+                        - ./modules/crawler/:/src
+                        - ./logs/crawler:/log/
+                container_name: "heatmap_crawler"
+                
        php-fpm:
-               build: './build/php-fpm'
+               build: './docker/php-fpm'
                depends_on: 
                        - database
                networks:
@@ -10 +24 @@
                        - "9000:9000"
                volumes:
                        - ./website/:/var/www/symfony
-                       - ./python-module:/var/python-module
 
                container_name: "heatmap_php_fpm"
        nginx:
-               build: './build/nginx'
+               build: './docker/nginx'
                depends_on:
                        - php-fpm
                        - database
+                       - crawler
                networks:
                        - frontend
                        - backend
                ports:
                        - "80:80"
                volumes:
-                       - ./logs:/var/nginx/log
+                       - ./logs/nginx:/var/nginx/log
                        - ./website/:/var/www/symfony
                container_name: "heatmap_nginx"
        database:
@@ -39 +53 @@
                        MONGO_INITDB_DATABASE: open-data-db
                        MONGO_INITDB_ROOT_USERNAME: root
                        MONGO_INITDB_ROOT_PASSWORD: root
-               volumes:
-                        - /database:/data/db
 networks:
        frontend:
        backend:

docker/crawler/Dockerfile

@@ +1 @@
+FROM python:3-slim
+
+RUN apt-get update && apt-get install -y cron
+RUN yes | apt-get install software-properties-common
+RUN apt-get install dialog apt-utils -y
+RUN pip install -q --no-cache-dir --upgrade pip
+ADD crontab /etc/cron.d/simple-cron
+RUN chmod 0644 /etc/cron.d/simple-cron
+RUN crontab /etc/cron.d/simple-cron
+
+ADD requirements.txt /requirements.txt
+RUN pip install -r /requirements.txt
+CMD cron -f

docker/nginx/Dockerfile

@@ +1 @@
+FROM nginx:alpine
+COPY nginx.conf /etc/nginx
+COPY conf.d /etc/nginx/conf.d
+ADD ./sites /etc/nginx/sites-available
+WORKDIR /var/www/
+CMD ["nginx"]

docker/nginx/conf.d/default.conf

@@ +1 @@
+upstream php-upstream {
+    server php-fpm:9000;
+}

docker/nginx/nginx.conf

@@ +1 @@
+user  nginx;
+worker_processes  4;
+daemon off;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    access_log  /var/log/nginx/access.log;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/sites-available/*.conf;
+}

docker/nginx/sites/default.conf

@@ +1 @@
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server ipv6only=on;
+
+    server_name localhost;
+    root /var/www/symfony/public;
+    index index.php index.html index.htm;
+
+    location / {
+         try_files $uri $uri/ /index.php$is_args$args;
+    }
+
+    location ~ \.php$ {
+        try_files $uri /index.php =404;
+        fastcgi_pass php-upstream;
+        fastcgi_index index.php;
+        fastcgi_buffers 16 16k;
+        fastcgi_buffer_size 32k;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_read_timeout 600;
+        include fastcgi_params;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+}

docker/php-fpm/Dockerfile

@@ +1 @@
+FROM php:7.4-fpm-alpine
+RUN apk update; \
+	apk upgrade; \
+	apk add autoconf openssl-dev g++ make && \
+    echo "**** install MongoDB ****\n" && \
+	pecl install mongodb && \
+	docker-php-ext-enable mongodb; \
+	apk del --purge autoconf openssl-dev g++ make;
+RUN echo "**** install Python ****\n" && \
+    apk add --no-cache python3 && \
+    if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python ; fi && \
+    \
+    echo "**** install pip ****\n" && \
+    python3 -m ensurepip && \
+    rm -r /usr/lib/python*/ensurepip && \
+    pip3 install --no-cache --upgrade pip setuptools wheel && \
+    if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi
+RUN echo "**** install PHP Composer ****\n" && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer

docker/php-fpm/dev/Dockerfile

@@ +1 @@
+#DEV ONLY DOCKERFILE
+FROM php:7.4-fpm-alpine
+RUN apk update; \
+	apk upgrade; \
+    apk add --no-cache $PHPIZE_DEPS \
+    && pecl install xdebug-2.9.5 \
+    && docker-php-ext-enable xdebug \
+	apk add autoconf openssl-dev g++ make && \
+	pecl install mongodb && \
+	docker-php-ext-enable mongodb; \
+	apk del --purge autoconf openssl-dev g++ make;
+RUN echo "**** install PHP Composer ****\n" && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer
+RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-igbinary.ini;
+RUN rm -fr /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini;
+RUN { \
+        echo '[xdebug]'; \
+        echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)"; \
+        echo 'xdebug.remote_enable = 1'; \
+        echo 'xdebug.remote_port = 9001'; \
+        echo 'xdebug.remote_autostart = 1'; \
+        echo 'xdebug.remote_connect_back = 0'; \
+        echo 'xdebug.remote_host = localhost'; \
+        echo 'xdebug.idekey = VSCODE'; \
+        echo 'xdebug.remote_log=/var/www/symfony/xdebug/xdebug.log'; \
+    } > /usr/local/etc/php/conf.d/php-config.ini

docker/php-fpm/dev/xdebug.ini

@@ +1 @@
+[XDebug]
+xdebug.remote_enable=1
+xdebug.remote_autostart=1
+xdebug.remote_port=9001
+xdebug.remote_connect_back=1

modules/crawler/.devcontainer/devcontainer.json

@@ +1 @@
+{
+    "forwardPorts": [
+        8000
+    ],
+    "extensions": [
+        "vscode-icons-team.vscode-icons",
+        "ms-python.python",
+        "njpwerner.autodocstring",
+        "magicstack.magicpython"
+    ],
+    "workspaceFolder": "/src",
+    "service": "crawler",
+    "shutdownAction": "stopCompose",
+    "dockerComposeFile": [
+        "../../../docker-compose.yml",
+        "../../../docker-compose-dev.yml"
+    ],
+    "mounts": [
+        "source=vscode-extensions-python,target=/src/.vscode-server/extensions,type=volume"
+    ]
+}

modules/crawler/crontab

@@ +1 @@
+0 1 * * * echo test
+# Mandatory blank line

modules/crawler/python.code-workspace

@@ +1 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"php.suggest.basic": false,
+		"files.autoSave": "afterDelay",
+		"editor.formatOnSave": true,
+		"python.linting.pylintEnabled": true,
+		"python.linting.enabled": true,
+		"python.linting.pylintPath": "pylint",
+		"python.pythonPath": "/usr/local/bin/python",
+		"python.formatting.provider": "yapf",
+	},
+	"extensions": {
+		"recommendations": [
+			"vscode-icons-team.vscode-icons",
+			"ms-python.python",
+			"njpwerner.autodocstring",
+			"magicstack.magicpython",
+			"ms-vscode-remote.remote-containers"
+		]
+	}
+}

modules/crawler/requirements.txt

@@ +1 @@
+emoji===0.5.4
+pylint===2.4.4
+yapf===0.30.0

modules/crawler/test.py

@@ +1 @@
+import emoji
+print(emoji.emojize("Python is :thumbs_up:"))
+print("test")

python-module/requirements.txt

@@ -1 @@
- emoji===0.5.4

python-module/test.py

@@ -1 @@
-import emoji
-print(emoji.emojize('Python is :thumbs_up:'))

scripts/build.sh

@@ -1 +1 @@
 #!/bin/bash
-#Build development environment
 docker-compose down
-docker-compose up --build -d
-docker-compose exec -T php-fpm composer install --no-interaction --working-dir=/var/www/symfony --no-dev
-docker-compose exec -T php-fpm pip install -r /var/python-module/requirements.txt
+docker-compose -f docker-compose.yml -f docker-compose-prod.yml up --build -d
+docker-compose exec -T php-fpm composer install --no-interaction --working-dir=/var/www/symfony --no-dev

scripts/dev/build.bat

@@ -1 @@
-docker-compose down --remove-orphans
-docker-compose -f .docker-compose-dev.yml up --build -d
+docker-compose -f docker-compose.yml -f docker-compose-dev.yml up --build -d
 docker-compose exec php-fpm composer config extra.symfony.allow-contrib true --no-interaction --working-dir=/var/www/symfony
 docker-compose exec php-fpm composer install --no-interaction --working-dir=/var/www/symfony
 docker-compose exec php-fpm composer update --no-interaction --working-dir=/var/www/symfony
-

scripts/dev/build.sh

@@ -1 +1 @@
 #!/bin/bash
 #Build development environment
-docker-compose down --remove-orphans
-docker-compose -f .docker-compose-dev.yml up --build -d
+docker-compose -f docker-compose.yml -f docker-compose-dev.yml up --build -d
 
 cat << "EOF"
  ______  ______  __    __  ______ ______  ______  ______  ______       __  __   __  ______  ______ ______  __      __        
@@ -10 +9 @@
  \ \_____\ \_____\ \_\ \ \_\ \_\  \ \_____\/\_____\ \_____\ \_\ \_\    \ \_\ \_\\"\_\/\_____\ \ \_\\ \_\ \_\ \_____\ \_____\ 
   \/_____/\/_____/\/_/  \/_/\/_/   \/_____/\/_____/\/_____/\/_/ /_/     \/_/\/_/ \/_/\/_____/  \/_/ \/_/\/_/\/_____/\/_____/                                                                                                                                                                                                                                                                                                                                                                                                                                      
 EOF
+docker-compose exec php-fpm composer config extra.symfony.allow-contrib true --no-interaction --working-dir=/var/www/symfony
+docker-compose exec php-fpm composer update --no-interaction --working-dir=/var/www/symfony
 docker-compose exec php-fpm composer install --no-interaction --working-dir=/var/www/symfony
-cat << "EOF"
- ______  __   ______     __   __   __   ______   ______  ______   __       __        
-/\  == \/\ \ /\  == \   /\ \ /\ "-.\ \ /\  ___\ /\__  _\/\  __ \ /\ \     /\ \       
-\ \  _-/\ \ \\ \  _-/   \ \ \\ \ \-.  \\ \___  \\/_/\ \/\ \  __ \\ \ \____\ \ \____  
- \ \_\   \ \_\\ \_\      \ \_\\ \_\\"\_\\/\_____\  \ \_\ \ \_\ \_\\ \_____\\ \_____\ 
-  \/_/    \/_/ \/_/       \/_/ \/_/ \/_/ \/_____/   \/_/  \/_/\/_/ \/_____/ \/_____/                                                                                                                                                                                     
-EOF
-docker-compose exec php-fpm pip install -r /var/python-module/requirements.txt

scripts/dev/pip.bat

@@ -1 @@
-docker-compose exec -T php-fpm pip install -r /var/python/requirements.txt
+docker-compose exec -T crawler pip install -r /var/python/requirements.txt

scripts/pip.sh

@@ -1 @@
-#install requirements pips.sh install -r /var/python/requirements.txt
-docker-compose exec -T php-fpm pip $@
+#!/bin/bash
+#install requirements pip.sh install -r /var/python/requirements.txt
+docker-compose exec -T crawler pip $@

scripts/restore_db.sh

@@ +1 @@
+#!/bin/bash
+docker-compose exec -T database mongorestore --username root --password root --authenticationDatabase admin --db open-data-db /dev-dump/data

website/.devcontainer/devcontainer.json

@@ +1 @@
+{
+    "forwardPorts": [8000],
+    "extensions": [
+        "vscode-icons-team.vscode-icons",
+        "felixfbecker.php-intellisense",
+        "whatwedo.twig",
+        "felixfbecker.php-debug",
+        "junstyle.php-cs-fixer"
+    ],
+    "workspaceFolder": "/var/www/symfony",
+    "service": "php-fpm",
+    "dockerComposeFile": ["../../docker-compose.yml", "../../docker-compose-dev.yml"],
+    "mounts":["source=vscode-extensions-php,target=/var/www/symfony/.vscode-server/extensions,type=volume"]
+
+}

website/.gitignore

@@ -7 +7 @@
 /public/bundles/
 /var/
 /vendor/
+.php_cs.cache
 ###< symfony/framework-bundle ###
 
 ###> friendsofphp/php-cs-fixer ###

website/src/Kernel.php

@@ -2 +2 @@
 
 namespace App;
 
-use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\Config\Loader\LoaderInterface;
+use const PHP_VERSION_ID;
 use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Routing\RouteCollectionBuilder;
+use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use function dirname;
 
-class Kernel extends BaseKernel
-{
+class Kernel extends BaseKernel {
     use MicroKernelTrait;
 
     private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
 
-    public function registerBundles(): iterable
-    {
+    public function registerBundles(): iterable {
         $contents = require $this->getProjectDir().'/config/bundles.php';
         foreach ($contents as $class => $envs) {
             if ($envs[$this->environment] ?? $envs['all'] ?? false) {
@@ -25 +25 @@
         }
     }
 
-    public function getProjectDir(): string
-    {
-        return \dirname(__DIR__);
+    public function getProjectDir(): string {
+        return dirname(__DIR__);
     }
 
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
-    {
+    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void {
         $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));
-        $container->setParameter('container.dumper.inline_class_loader', \PHP_VERSION_ID < 70400 || $this->debug);
+        $container->setParameter('container.dumper.inline_class_loader', PHP_VERSION_ID < 70400 || $this->debug);
         $container->setParameter('container.dumper.inline_factories', true);
         $confDir = $this->getProjectDir().'/config';
 
@@ -43 +41 @@
         $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
     }
 
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
-    {
+    protected function configureRoutes(RouteCollectionBuilder $routes): void {
         $confDir = $this->getProjectDir().'/config';
 
         $routes->import($confDir.'/{routes}/'.$this->environment.'/*'.self::CONFIG_EXTS, '/', 'glob');

website/symfony.code-workspace

@@ -7 +7 @@
 	"settings": {
 		"php.suggest.basic":false,
 		"files.autoSave": "afterDelay",
+		"php-cs-fixer.executablePath": "/var/www/symfony/vendor/bin/php-cs-fixer",
+		"php-cs-fixer.config": ".php_cs;.php_cs.dist",
+		"php-cs-fixer.onsave": true
 	},
 	"extensions": {
 		"recommendations": [
 			"vscode-icons-team.vscode-icons",
 			"felixfbecker.php-intellisense",
-			"whatwedo.twig"
+			"whatwedo.twig",
+			"felixfbecker.php-debug",
+			"junstyle.php-cs-fixer"
 		]
 	},
 	"tasks": {
 		"version": "2.0.0",
 		"tasks": [{
-			"label": "PHP Linter",
+			"label": "PHP Linter (DOCKER SERVICE)",
 			"command": "docker-compose",
-			"args": ["exec", "php-fpm", "/var/www/symfony/vendor/bin/php-cs-fixer","fix", "--dry-run", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation", "--using-cache=no"],
+			"args": ["exec", "php-fpm", "./vendor/bin/php-cs-fixer", "fix", "/var/www/symfony/src", "--dry-run", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation", "--using-cache=no"],
 			"windows":{
 				"command": "docker-compose",
-				"args": ["exec", "php-fpm", "/var/www/symfony/vendor/bin/php-cs-fixer", "fix", "--dry-run", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation", "--using-cache=no"],
+				"args": ["exec", "php-fpm","./vendor/bin/php-cs-fixer", "fix", "/var/www/symfony/src", "--dry-run", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation", "--using-cache=no"],
 			}
 		},
 		{
-			"label": "Format",
+			"label": "Format (DOCKER SERVICE)",
+			"command": "docker-compose",
+			"args": ["exec", "php-fpm", "/var/www/symfony/vendor/bin/php-cs-fixer", "fix", "/var/www/symfony/src", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation"],
+			"windows":{
+				"command": "docker-compose",
+				"args": ["exec", "php-fpm", "/var/www/symfony/vendor/bin/php-cs-fixer", "fix", "/var/www/symfony/src", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation"],
+			}
+		},{
+			"label": "PHP Linter",
 			"command": "docker-compose",
-			"args": ["exec", "php-fpm", "/var/www/symfony/vendor/bin/php-cs-fixer","fix", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation"],
+			"args": ["exec", "php-fpm", "./vendor/bin/php-cs-fixer", "fix", "/var/www/symfony/src", "--dry-run", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation", "--using-cache=no"],
 			"windows":{
 				"command": "docker-compose",
-				"args": ["exec", "php-fpm", "/var/www/symfony/vendor/bin/php-cs-fixer", "fix", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation"],
+				"args": ["exec", "php-fpm","./vendor/bin/php-cs-fixer", "fix", "/var/www/symfony/src", "--dry-run", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation", "--using-cache=no"],
+			}
+		},
+		{
+			"label": "Format",
+			"command": "./vendor/bin/php-cs-fixer",
+			"args": ["fix", "/var/www/symfony/src", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation"],
+			"windows":{
+				"command": "./vendor/bin/php-cs-fixer",
+				"args": ["fix", "/var/www/symfony/src", "--config", "/var/www/symfony/.php_cs", "--stop-on-violation"],
 			}
 		}]
 	},
 	"launch": {
-		"configurations": [{
+		"configurations": [
+			{
             "name": "Listen for XDebug",
             "type": "php",
-            "request": "launch",
-			"port": 9000
+			"request": "launch",
+			"log": true,
+			"pathMappings": {
+				"/var/www/symfony": "${workspaceFolder}/"
+			},
+			"port": 9001
 			}]
 	}
 }