Makefile CLIENT name

don't know if delete would be good

Makefile

@@ -25,12 +25,12 @@ else
 DC=ENV=$(ENV) CLIENT=$(CLIENT) "$(DOCKERCOMPOSE)" --project-name "$(CLIENT)_$(ENV)" --file conf/docker-compose.win.yml $(DC_OVERRIDE) $(DC_OVERRIDE_ENV)
 endif
 
-
 default:
 	$(info $(USAGE))
 	$(error Exiting)
 
 docker-build:
+	$(DC) pull
 	$(DC) build
 	$(DC) up -d
 
@@ -64,8 +64,8 @@ config:
 
 	@echo "  --> Generating mysql auth file"
 	@cat conf/env/store-mysql.env \
-		| python -c "import sys; import string; v=sys.stdin.readline().split('MYSQL_ROOT_PASSWORD=')[1]; print(string.Template(open('conf/build/mysql/my.cnf').read()).substitute({'PASSWORD':v}))" \
-		| docker exec -i $(CLIENT).store-mysql.$(ENV) sh -c 'cat > /root/.my.cnf'
+			| python -c "import sys; import string; v=sys.stdin.readline().split('MYSQL_ROOT_PASSWORD=')[1]; print(string.Template(open('conf/build/mysql/my.cnf').read()).substitute({'PASSWORD':v}))" \
+			| docker exec -i $(CLIENT).store-mysql.$(ENV) sh -c 'cat > /root/.my.cnf'
 
 db-backup-all: db-backup-website db-backup-store
 
@@ -83,6 +83,11 @@ db-backup-store:
 
 db-restore-all: db-restore-website db-restore-store
 
+db-backup-script:
+	@mkdir -p backup/
+	@docker exec $(CLIENT).postgres.$(ENV) pg_dumpall --database database -c -U postgres > backup/postgres_$(ENV)_`date +%d-%m-%Y"_"%H_%M_%S`.sql
+	@docker exec $(CLIENT).store-mysql.$(ENV) mysqldump -uroot database > backup/store-mysql_$(ENV)_`date +%d-%m-%Y"_"%H_%M_%S`.sql
+
 db-restore-website:
 	@echo "Restoring file to database (backup/postgres.sql)"
 	@cat backup/postgres.sql | docker exec -i $(CLIENT).postgres.$(ENV) psql --dbname database -U user
@@ -114,4 +119,4 @@ es-populate:
 
 sys:
 	@echo $(SYS)
-	@echo $(DC)
+	@echo $(DC)

conf/build/php/Dockerfile

@@ -1,53 +1,54 @@
-FROM php:7.1-fpm
+FROM php:7.1-fpm-buster
 
 ENV TERM=xterm
 
-RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list.d/debian-backports.list
+#RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main\ndeb http://archive.debian.org/debian/ jessie-backports main" > /etc/apt/sources.list.d/debian-backports.list
+
 RUN apt-get clean \
-	&& apt-get update \
-	&& apt-get install -y lsof nano less git locales
+        && apt-get update \
+        && apt-get install -y lsof nano less git locales
 
 RUN echo 'fr_FR.UTF-8 UTF-8' > /etc/locale.gen \
-	&& /usr/sbin/locale-gen
+        && /usr/sbin/locale-gen
 
 RUN apt-get update \
     && apt-get -y install libgmp-dev \
-	&& ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/gmp.h \
-	&& docker-php-ext-install gmp \
-	&& docker-php-ext-configure gmp 
+        && ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/gmp.h \
+        && docker-php-ext-install gmp \
+        && docker-php-ext-configure gmp
 
 
 RUN apt-get update \
-	&& apt-get install -y ffmpeg exiftool graphviz libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mysql-client nodejs npm \
-	&& apt-get install -y --no-install-recommends libmagickwand-dev \
-	&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-	&& docker-php-ext-install -j4 gd mcrypt xsl zip intl gettext soap pdo_pgsql pdo_mysql mysqli pgsql json readline opcache \
-	&& pecl install geoip-1.1.1 redis imagick mongodb \
-	&& docker-php-ext-enable geoip redis imagick mongodb
+        && apt-get install -y ffmpeg exiftool graphviz libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mariadb-client nodejs npm \
+        && apt-get install -y --no-install-recommends libmagickwand-dev \
+        && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+        && docker-php-ext-install -j4 gd mcrypt xsl zip intl gettext soap pdo_pgsql pdo_mysql mysqli pgsql json readline opcache \
+        && pecl install geoip-1.1.1 redis imagick mongodb \
+        && docker-php-ext-enable geoip redis imagick mongodb
 
 RUN { \
-	echo 'opcache.memory_consumption=128'; \
-	echo 'opcache.interned_strings_buffer=8'; \
-	echo 'opcache.max_accelerated_files=4000'; \
-	echo 'opcache.revalidate_freq=60'; \
-	echo 'opcache.fast_shutdown=1'; \
-	echo 'opcache.enable_cli=1'; \
-	} >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+        echo 'opcache.memory_consumption=128'; \
+        echo 'opcache.interned_strings_buffer=8'; \
+        echo 'opcache.max_accelerated_files=4000'; \
+        echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.fast_shutdown=1'; \
+        echo 'opcache.enable_cli=1'; \
+        } >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 
 COPY zz-logformat.conf /usr/local/etc/php-fpm.d/
 COPY php.ini /usr/local/etc/php/conf.d/
 
 RUN (curl --silent --show-error https://getcomposer.org/installer | php) \
-	&& mv composer.phar /usr/local/bin/composer
+        && mv composer.phar /usr/local/bin/composer
 
 RUN curl --location --silent --show-error https://symfony.com/installer -o /usr/local/bin/symfony \
-	&& chmod a+x /usr/local/bin/symfony
+        && chmod a+x /usr/local/bin/symfony
 
 RUN curl --location --silent --show-error https://s3.amazonaws.com/files.drush.org/drush.phar -o /usr/local/bin/drush \
-	&& chmod a+x /usr/local/bin/drush
+        && chmod a+x /usr/local/bin/drush
 
 RUN (npm install -g uglify-es) \
-	&& ln -s /usr/bin/nodejs /usr/local/bin/node
+        && ln -s /usr/bin/nodejs /usr/local/bin/node
 
 RUN apt-get clean \
-	&& rm -rf /var/lib/apt/lists/
+        && rm -rf /var/lib/apt/lists/

volume/www/website/www/app/Resources/views/default/index.html.twig

@@ -19,7 +19,7 @@
                         </div>
                         <div class="header-video-inner">
                             <video loop="" preload="metadata" autoplay="" id="vid" muted="muted">
-                                {# <source src="/img/home_video.mp4" type="video/mp4"> #}
+                                 <source src="/img/home_video.mp4" type="video/mp4">
                             </video>
                         </div>
 

volume/www/website/www/app/config/fos_elastica.yml

@@ -1,9 +1,7 @@
 fos_elastica:
     clients:
         default: { host: %elastic_host%, port: %elastic_port% }
-<<<<<<< HEAD
-   
-=======
+
     indexes:
         tags:
             types:
@@ -143,4 +141,4 @@ fos_elastica:
                         model: AppBundle\Entity\User
                         provider: ~
                         finder: ~
->>>>>>> origin/master
+

volume/www/website/www/app/config/parameters-preprod.yml

@@ -8,8 +8,8 @@ parameters:
     database_port: '5432'
     database_name: database
     database_user: user
-    #database_password: 7C|Uk2B[.>"6{QO{
-    database_password: b|RN:iR<g,TNMqM6
+    database_password: 7C|Uk2B[.>"6{QO{
+    #database_password: b|RN:iR<g,TNMqM6
 #Mongo
     mongodb_server: "mongodb://tt-website.mongo.preprod:27017"
 #Prestashop

volume/www/website/www/app/config/parameters-prod.yml

@@ -36,6 +36,6 @@ parameters:
         service_mail_subject: 'mailto:looping@talentstube.com'
         ttl: 300
         urgency: high
-            topic: Emploi
+        topic: Emploi
     push_params.public_key: BG2lV673DvB67dzEwX9GKfds3sXaEdtZo2oWO1cO2xUdTJAFZ_rV_UrP1nHQz-F8LJNO9HxG0kmQRIb54JL1ZCA
 

volume/www/website/www/src/AppBundle/Controller/Api/SecurityController.php

@@ -14,10 +14,10 @@ use FOS\UserBundle\Event\GetResponseUserEvent;
 use FOS\UserBundle\Model\UserInterface;
 use AppBundle\Entity\Company;
 use AppBundle\Exception\ResourceValidationException;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
 class SecurityController extends FOSRestController
 {
-
   /**
    * @Rest\Post(path="/api/confirmAccount", name="api_confirm_account")
    * @Rest\View
@@ -207,6 +207,7 @@ class SecurityController extends FOSRestController
     // https://graph.facebook.com/debug_token?
     // input_token=EAAhJAcmfVSoBAFESNEQPJFv4fOqY5G6pSUwU3BOVzmhfoP9DTu827RUelrUQHFJshZBHsHZAlZA22MvfZArsZAlJBvZBWgbuJAJQjbMcgr9dwtHZBWZCI61nsvSBbsjiA8RgonGu0zcMD8GZCJDoZA26fZAgmURRgJUprfZCOvEzZBFgfUo1UjIHhiqey&access_token=2332071840142634|afb8bbca72bd8c517c64f81e998e4f12
 
+    //TODO: à mettre en config
     $req = 'https://graph.facebook.com/debug_token?input_token=' . ($token) . '&access_token=1800752833559014|454de729b1e58f506f94c8b50ca5c011';//PROD PREPROD
     //'&access_token=2332071840142634|afb8bbca72bd8c517c64f81e998e4f12'; //DEV
 

volume/www/website/www/src/AppBundle/Entity/User.php

@@ -6,16 +6,15 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use FOS\UserBundle\Model\User as BaseUser;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-<<<<<<< HEAD
+
 use JMS\Serializer\Annotation\ExclusionPolicy;
 use JMS\Serializer\Annotation\Expose;
 use Hateoas\Configuration\Annotation as Hateoas;
 use JMS\Serializer\Annotation\Groups;
 use JMS\Serializer\Annotation\Type;
 
-=======
 use AppBundle\Utils\Traits\CareerJsonTrait;
->>>>>>> origin/master
+
 /**
  * @ORM\Entity(repositoryClass="AppBundle\Repository\UserRepository")
  * @ORM\Table(name="fos_user")

volume/www/website/www/vendor/bin/doctrine-dbal_BASE_9420

@@ -0,0 +1 @@
+../doctrine/dbal/bin/doctrine-dbal

volume/www/website/www/vendor/bin/doctrine-dbal_REMOTE_9420

@@ -1,5 +1,5 @@
 XSym
-0028
-6ad9c04ba34037260849b181387a137a
-../doctrine/orm/bin/doctrine
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+0034
+9c0044dbf9d81c454fd8aeca68e706da
+../doctrine/dbal/bin/doctrine-dbal
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             

volume/www/website/www/vendor/bin/simple-phpunit

@@ -1,5 +0,0 @@
-XSym
-0044
-2a11eaeab3acf944b97bb7a15e6c72bf
-../symfony/phpunit-bridge/bin/simple-phpunit
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   

volume/www/website/www/web/sass/modules/_search.scss

@@ -121,7 +121,7 @@
 
 .fix-search{
   position: fixed;
-  top: 89px;
+  top: 60px;
   width: 100%;
   -webkit-transition: all 0.5s;
   -moz-transition: all 0.5s;