modif Company

hide birthday field (date issue) /entreprise/me/mon_compte

.gitignore

@@ -6,4 +6,9 @@
 !/volume/www
 /volume/www/**/conf/nginx.conf
 /backup
-/conf/env/*.env
+/conf/env/*.env
+volume/www/website/.idea
+/volume/www/website/store/themes/talentstube-20170413/cache/*
+/volume/www/website/store/img/tmp/*
+volume/www/website/www/app/Resources/views/default/index.html.twig
+TODO

Makefile

@@ -2,7 +2,7 @@
 CLIENT=tt-website
 
 DOCKERCOMPOSE := $(shell command -v docker-compose 2> /dev/null)
-USAGE := Usage: make ENV={prod|preprod|dev} {docker-build|docker-start|docker-stop|docker-restart}
+USAGE := Usage: make ENV={prod|preprod|dev} {SYS=windows|linux}  {docker-build|docker-start|docker-stop|docker-restart}
 
 ifndef DOCKERCOMPOSE
 $(error docker-compose is not available)
@@ -14,16 +14,23 @@ $(info $(USAGE))
 $(error Exiting)
 endif
 
+SYS=linux
+
 DC_OVERRIDE := $(shell test -e conf/docker-compose.override.yml && echo "--file conf/docker-compose.override.yml")
 DC_OVERRIDE_ENV := $(shell test -e conf/docker-compose.$(ENV).yml && echo "--file conf/docker-compose.$(ENV).yml")
 
-DC=ENV=$(ENV) CLIENT=$(CLIENT) $(DOCKERCOMPOSE) --project-name "$(CLIENT)_$(ENV)" --file conf/docker-compose.yml $(DC_OVERRIDE) $(DC_OVERRIDE_ENV)
+ifeq ($(SYS),linux)
+DC=ENV=$(ENV) CLIENT=$(CLIENT) "$(DOCKERCOMPOSE)" --project-name "$(CLIENT)_$(ENV)" --file conf/docker-compose.yml $(DC_OVERRIDE) $(DC_OVERRIDE_ENV)
+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
 
@@ -57,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
 
@@ -76,15 +83,20 @@ 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/store-mysql.sql)"
-	@cat backup/postgres.sql | docker exec -i $(CLIENT).postgres.$(ENV) psql --dbname database -U postgres
+	@echo "Restoring file to database (backup/postgres.sql)"
+	@cat backup/postgres.sql | docker exec -i $(CLIENT).postgres.$(ENV) psql --dbname database -U user
 	@docker cp backup/mongo $(CLIENT).mongo.$(ENV):/
 	@docker exec -t $(CLIENT).mongo.$(ENV) mongorestore --drop --gzip --db=tt_history /mongo/tt_history
 
 db-restore-store:
 	@echo "Restoring file to database (backup/store-mysql.sql)"
-	@docker exec -i $(CLIENT).mysql.$(ENV) mysql -uroot database < backup/store-mysql.sql
+	@docker exec -i $(CLIENT).store-mysql.$(ENV) mysql -uroot database < backup/store-mysql.sql
 
 cc:
 	@echo "Clearing symfony cache"
@@ -95,7 +107,7 @@ entities:
 	@docker exec -i $(CLIENT).php.$(ENV) su www-data --shell=/bin/bash -c "/home/www/website/www/bin/console doctrine:generate:entities AppBundle"
 
 db-diff:
-	@docker exec -i $(CLIENT).php.$(ENV) su www-data --shell=/bin/bash -c "/home/www/website/www/bin/console doctrine:migrations:diff"
+	@docker exec -i $(CLIENT).php.$(ENV) su www-data -c "/home/www/website/www/bin/console doctrine:migrations:diff"
 
 db-migrate:
 	@docker exec -i $(CLIENT).php.$(ENV) su www-data --shell=/bin/bash -c "/home/www/website/www/bin/console doctrine:migrations:migrate"
@@ -104,3 +116,7 @@ db-deploy: db-diff db-migrate
 
 es-populate:
 	@docker exec -i $(CLIENT).php.$(ENV) su www-data --shell=/bin/bash -c "/home/www/website/www/bin/console fos:elastica:populate"
+
+sys:
+	@echo $(SYS)
+	@echo $(DC)

TODO

@@ -0,0 +1,3 @@
+
+Todo:
+  ☐ Item

conf/build/nginx/Dockerfile

@@ -10,6 +10,8 @@ RUN rm /etc/nginx/conf.d/default.conf \
 	&& sed -i 's|include /etc/nginx/conf.d/\*.conf;|include /etc/nginx/conf.d/\*.conf;\ninclude /etc/nginx/sites-enabled/\*.conf;\n|' /etc/nginx/nginx.conf
 
 COPY log_format.conf /etc/nginx/conf.d/
+COPY tt-dev.crt /etc/nginx/ssl/server.crt
+COPY tt-dev.key /etc/nginx/ssl/server.key
 
 RUN apt-get clean \
 	&& rm -rf /var/lib/apt/lists/

conf/build/nginx/tt-dev.crt

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrjCCApYCCQD0c9mokUtilTANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMC
+RlIxDDAKBgNVBAgMA0JaSDEOMAwGA1UEBwwFQXVyYXkxGTAXBgNVBAoMEHRhbGVu
+dHN0dWJlLnRlc3QxETAPBgNVBAsMCGUtZGVjbGljMRkwFwYDVQQDDBB0YWxlbnRz
+dHViZS50ZXN0MSIwIAYJKoZIhvcNAQkBFhN0aG9tYXNAZS1kZWNsaWMuY29tMB4X
+DTE4MDQzMDA5MTkwMVoXDTE5MDQzMDA5MTkwMVowgZgxCzAJBgNVBAYTAkZSMQww
+CgYDVQQIDANCWkgxDjAMBgNVBAcMBUF1cmF5MRkwFwYDVQQKDBB0YWxlbnRzdHVi
+ZS50ZXN0MREwDwYDVQQLDAhlLWRlY2xpYzEZMBcGA1UEAwwQdGFsZW50c3R1YmUu
+dGVzdDEiMCAGCSqGSIb3DQEJARYTdGhvbWFzQGUtZGVjbGljLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBANVTxapL6RtTjEoO4wWTswIqTW/zTI4B
+bETbPHYOeb8+kgLTxH04ETmVzPYz0b5RfkotY0EZzwntv3c5JsLnqqrQAXN4fcl3
+iIXCXMKUo1Nrbp0yAMGzGDmnpmvABE/nkg0ZJ3YeKV9xkEYcyMCU+DhUuazd1W3d
+odjMs/BHeuoZau9HRE+6lE+/tqWhHrmgRghP8g2Z2g8lrHak5BuQNwnvVmg6oJae
+94DWygKV7ZJ3vBHRkLIOaG+mVI8FRjrlHQke/tFStD2dd3TgsqvzYBM3f1VBm85y
+qhyIxr2s+xgOl2/Z0VZzmVgI2jAPhvN8VNvXtlFM6BOkyHAFwm7jCtcCAwEAATAN
+BgkqhkiG9w0BAQsFAAOCAQEAjlPu5wtZwW0jP0cBBBvZWLRe9+Wlz9uJXiOb2AMF
+ibYeKgcGNbruY8Ayvmm++C/mMpkm50NG5ycEiO5rB/1665zB5ibWAswRD+F5rjzx
+8qM4YsUVDkiuW5ul0RI2KO6llAbdQaCfaqXtsCZ+b/XVwe41S1ZkvigLaL99pscU
+ghgD9yz/RY6C7PHPS+8dF0Uc+YND3vqWfAhUQCXdXetXndPMxwBOXnT08RQOWMBK
+lTSHIsFACFhynL3wfQ6xH4+/TQkquxzqqh3MeB1LpqHiFChCoNmBPKWf7ZvFkg/p
+4DzXTkLs6G6/WM7DuBmwB6e5tevJfe/BSkzCLaJKABDaOA==
+-----END CERTIFICATE-----

conf/build/nginx/tt-dev.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDVU8WqS+kbU4xK
+DuMFk7MCKk1v80yOAWxE2zx2Dnm/PpIC08R9OBE5lcz2M9G+UX5KLWNBGc8J7b93
+OSbC56qq0AFzeH3Jd4iFwlzClKNTa26dMgDBsxg5p6ZrwARP55INGSd2HilfcZBG
+HMjAlPg4VLms3dVt3aHYzLPwR3rqGWrvR0RPupRPv7aloR65oEYIT/INmdoPJax2
+pOQbkDcJ71ZoOqCWnveA1soCle2Sd7wR0ZCyDmhvplSPBUY65R0JHv7RUrQ9nXd0
+4LKr82ATN39VQZvOcqociMa9rPsYDpdv2dFWc5lYCNowD4bzfFTb17ZRTOgTpMhw
+BcJu4wrXAgMBAAECggEACj5ikIHiqLBDXU8Hsb3c666yVzzcoTkKROguKBEb4YYU
+ptQabFTj5tr9o5jranMpWFCDop2lpnlnJ0d0SAmt1VP1reDMUX9O6/VgVOukSB4x
+ipTbGnIKKMKXKDdpPZkGF2Ds1ywtmmqund9F+JFute3DmLxyQjtRSULTJSeZjGIj
+kk4mUHIZr71q2KocBEhDZhoaf6aiM3tfyXIlg0C6GzcfGKk4a2C6Ia7D24icPLa7
+JE4Omh6w8duQsme8YeFbbixLlwm+74qvo7k8ubqZAvvODQlKz4xiT1App4cTq6nm
+PbAuFvLX0DtkndBSgAUa3h8iuchdv15M2FkUWkenaQKBgQD7iup0vZqqIFh6Sk08
+k3Skbit6TXwMt4yjP9/JTgMaIO5LfZiht2xyxN4gN2XVp6k4Jn5SPxGuGV+e5QSr
+9R04x5wN6NwZAprL70UuztHZdXpzNVogF4hF4LdGDT8CbeFF5ciiTQaAKwX9euOT
+HRf6RGT80qiKVcZ+C3zhR6CxAwKBgQDZG39+6DzdGetLzls7B6R1PPV7RLOn6bts
+jbxSkx/VksHkS1Q4lG1fXM2q/VdSTFg/gNNKzLCADDVrO9KonvVrvMZlshiSLXTJ
+GVgfe+UGSL7VjbH4G4bAqznK5zK8ADI1BRyCU3UrzFqRHoV9h9e2qIfjJrK4taX7
+G5KAukDUnQKBgQC6GBLOnTtgY5+xkWjEyP6Ba7QkvlBpBB465FWGk31+BiDlnpyd
+/5pu6jC/OtzPDUQG84t/A4Pr/n+ciShEo4mj6SENtVmn8yJcf776Gy5rKBuYQj9U
+ALTjpZVRcRlNjccctBwT3tJRXgMHfbQBsYN8tr7TwHHKLh00QQF5lUlPywKBgB2a
+SkAbmnDrX9HuSTI7UIlLzo0ISRbUH+IlUVBRDz4nzJg8TTeJxYADP2fZM1bdYgsG
+ncjNMCPFhmMgvRCQ3BXcn5CuP/tuh0YEVqe0VP4OXTbxIxsZZb5Pmom4DIrl2/Ku
+x7xddNSMAK1Y5ArBwv/86spmNGhLHF6o28kBnGVhAoGAOcGzpJi1l0BzNUKBS512
+XlLUYswFW6OqcEk1iGTvEFUzZ9Agp2Yc7HZ3MrmCAjugx37tAfNKQglF2/AJ9Uuy
+yoUpPtdXX6CuPTMkzCkvAYbRGohE/cw7ZjI6vTqoEPiyrQA1lJYTIMQm3FYivjJl
+z84K0Vlv64BeiIpJrvzW+2A=
+-----END PRIVATE KEY-----

conf/build/php/Dockerfile

@@ -1,47 +1,54 @@
-FROM php:7.1-fpm
+FROM php:7.1-fpm-buster
 
 ENV TERM=xterm
 
-RUN echo 'deb http://ftp.debian.org/debian jessie-backports 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 install -y ffmpeg exiftool graphviz libfreetype6-dev libjpeg62-turbo-dev libpng12-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 -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
+
+
+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 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-js) \
-	&& ln -s /usr/bin/nodejs /usr/local/bin/node
+RUN (npm install -g uglify-es) \
+        && 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/

conf/build/php_light/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-fpm
+FROM php:7.1-fpm-buster
 
 ENV TERM=xterm
 
@@ -10,7 +10,7 @@ RUN echo 'fr_FR.UTF-8 UTF-8' > /etc/locale.gen \
 	&& /usr/sbin/locale-gen
 
 RUN apt-get update \
-	&& apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng12-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mysql-client \
+	&& apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mariadb-client \
 	&& 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 \
@@ -33,4 +33,4 @@ RUN (curl --silent --show-error https://getcomposer.org/installer | php) \
 	&& mv composer.phar /usr/local/bin/composer
 
 RUN apt-get clean \
-	&& rm -rf /var/lib/apt/lists/
+	&& rm -rf /var/lib/apt/lists/

conf/build/php_light_win/Dockerfile

@@ -0,0 +1,35 @@
+FROM php:7.1-fpm
+
+ENV TERM=xterm
+
+RUN apt-get clean \
+	&& 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
+RUN apt-get update \
+	&& apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mysql-client \
+	&& 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 \
+	&& docker-php-ext-enable geoip redis imagick
+
+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
+
+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
+
+RUN apt-get clean \
+	&& rm -rf /var/lib/apt/lists/

conf/build/php_light_win/php.ini

@@ -0,0 +1,7 @@
+date.timezone = Europe/Paris
+display_errors = Off
+memory_limit = 256M
+log_errors = On
+error_reporting  =  E_ALL
+error_log = /dev/stdout
+report_memleaks = On

conf/build/php_light_win/zz-logformat.conf

@@ -0,0 +1,2 @@
+[www]
+access.format = "%R [%t] \"%m %r%Q%q\" %s %f %{mili}dms %{kilo}MKb %C%%"

conf/build/php_win/Dockerfile

@@ -0,0 +1,55 @@
+FROM php:7.1-fpm
+
+ENV TERM=xterm
+
+#RUN echo 'deb http://ftp.debian.org/debian jessie-backports 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" > /etc/apt/sources.list.d/debian-backports.list
+
+RUN apt-get clean \
+	&& 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
+
+RUN apt-get update && apt-get install -my wget gnupg
+
+RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - \
+    && apt-get install -y nodejs
+
+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 libgmp-dev nodejs \
+	&& 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 gmp \
+	&& docker-php-ext-configure gmp \
+	&& 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
+
+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
+
+RUN curl --location --silent --show-error https://symfony.com/installer -o /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
+
+RUN (npm install -g uglify-es) \
+	&& ln -s /usr/bin/nodejs /usr/local/bin/node
+
+RUN apt-get clean \
+	&& rm -rf /var/lib/apt/lists/

conf/build/php_win/php.ini

@@ -0,0 +1,9 @@
+date.timezone = Europe/Paris
+display_errors = Off
+memory_limit = 768M
+log_errors = On
+error_reporting  =  E_ALL
+error_log = /dev/stdout
+report_memleaks = On
+upload_max_filesize = 512M
+post_max_size = 512M

conf/build/php_win/zz-logformat.conf

@@ -0,0 +1,2 @@
+[www]
+access.format = "%R [%t] \"%m %r%Q%q\" %s %f %{mili}dms %{kilo}MKb %C%%"

conf/docker-compose.dev.yml

@@ -4,7 +4,8 @@ services:
 
   nginx:
     ports:
-      - "8080:80"
+      - "80:80"
+      - "443:443"
     volumes:
       - ../volume/www:/home/www:cached
     restart: "no"

conf/docker-compose.preprod.yml

@@ -0,0 +1,13 @@
+version: '3'
+
+services:
+  nginx:
+    networks:
+      - default
+      - frontnginx_front
+
+networks:
+  default:
+    driver: bridge
+  frontnginx_front:
+    external: true

conf/docker-compose.win.yml

@@ -0,0 +1,75 @@
+version: "3"
+
+services:
+  ##
+  ## WEBSITE RESSOURCES
+  ##
+  nginx:
+    build: build/nginx
+    container_name: ${CLIENT}.nginx.${ENV}
+    hostname: nginx
+    volumes:
+      - ../volume/nginx/etc.nginx.sites-enabled:/etc/nginx/sites-enabled
+      - ../volume/www:/home/www
+    restart: always
+
+  php:
+    build: build/php_win
+    container_name: ${CLIENT}.php.${ENV}
+    hostname: php
+    volumes:
+      - ../volume/www:/home/www
+    restart: always
+
+  postgres:
+    image: postgres:9.6
+    container_name: ${CLIENT}.postgres.${ENV}
+    hostname: postgres
+    env_file: env/postgres.env
+    volumes:
+      - tt-postgres:/var/lib/postgresql/data
+    restart: always
+
+  mongo:
+    image: mongo:3.4
+    container_name: ${CLIENT}.mongo.${ENV}
+    hostname: mongo
+    volumes:
+      - tt-mongo:/data/db
+    restart: always
+
+  elasticsearch:
+    build: build/elasticsearch
+    container_name: ${CLIENT}.elasticsearch.${ENV}
+    hostname: elasticsearch
+    volumes:
+      - search_db_data:/usr/share/elasticsearch/data
+    restart: always
+
+  ##
+  ## STORE RESSOURCES
+  ##
+  store-php:
+    build: build/php_light_win
+    container_name: ${CLIENT}.store-php.${ENV}
+    hostname: store-php
+    volumes:
+      - ../volume/www:/home/www
+    restart: always
+
+  store-mysql:
+    build: build/mysql
+    container_name: ${CLIENT}.store-mysql.${ENV}
+    hostname: store-mysql
+    env_file: env/store-mysql.env
+    volumes:
+      - ../volume/store-mysql/var.lib.mysql:/var/lib/mysql
+    restart: always
+
+# Elastic does not play well with physical volume (folder rights trouble)
+volumes:
+  ? search_db_data
+  tt-postgres:
+    external: true
+  tt-mongo:
+    external: true

conf/env/sample/mysql.env

@@ -1,4 +0,0 @@
-MYSQL_ROOT_PASSWORD=
-MYSQL_DATABASE=database
-MYSQL_USER=user
-MYSQL_PASSWORD=

conf/env/sample/postgres.env

@@ -1,3 +0,0 @@
-POSTGRES_USER=
-POSTGRES_PASSWORD=
-POSTGRES_DB=

volume/www/website/.gitignore

@@ -1 +1,2 @@
 conf/nginx.conf
+/vendor/

volume/www/website/conf/nginx-dev.conf

@@ -8,15 +8,18 @@ upstream store_php {
 }
 
 server {
-
+    listen 80;
+    listen 443 ssl;
     server_name talentstube.test;
     root /home/www/website/www/web;
     client_max_body_size 500M;
     sendfile off;
+    ssl_certificate /etc/nginx/ssl/server.crt;
+    ssl_certificate_key /etc/nginx/ssl/server.key;
 
     # DEV
     location / {
-        try_files $uri /app_dev.php$is_args$args;
+        try_files $uri /app.php$is_args$args;
     }
 
     location ~ ^/(app_dev|config)\.php(/|$) {

volume/www/website/conf/nginx-preprod.conf

@@ -1,44 +1,22 @@
-
 upstream website_php-preprod {
-    server tt.website-preprod:9000;
+    server tt-website.php.preprod:9000;
 }
 
 upstream store_php-preprod {
-    server tt.store-preprod:9000;
+    server tt-website.store-php.preprod:9000;
 }
 
 server {
-       listen 80;
-       server_name pp.talentstube.com;
-       return 301 https://pp.talentstube.com$request_uri;
-}
-
-server {
-    listen 443 ssl http2;
+    listen 80;
     server_name pp.talentstube.com;
 
     client_max_body_size 500M;
+    root /home/www/website/www/web;
 
-    root /home/www/pp.talentstube.com/www/web;
-
-    access_log /home/www/pp.talentstube.com/log/access.log vhosts;
-    error_log  /home/www/pp.talentstube.com/log/error.log;
-
-    ssl on;
-    ssl_certificate /etc/ssl/private/talentstube.com.chain.crt;
-    ssl_certificate_key /etc/ssl/private/talentstube.com.key;
-
-    ssl_session_timeout 24h;
-    ssl_session_cache shared:SSL:10m;
-
-    ssl_dhparam /etc/ssl/dhparam.pem;
-
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-    ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA';
-    ssl_prefer_server_ciphers on;
+    access_log /home/www/website/log/access.log vhosts;
+    error_log  /home/www/website/log/error.log;
 
     location / {
-        # try to serve file directly, fallback to app.php
         try_files $uri /app.php$is_args$args;
     }
 
@@ -58,6 +36,7 @@ server {
         # for more information).
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         fastcgi_param DOCUMENT_ROOT $realpath_root;
+        fastcgi_param  HTTPS on;
     }
 
     # PROD
@@ -78,12 +57,13 @@ server {
         # http://domain.tld/app.php/some-path
         # Remove the internal directive to allow URIs like this
         internal;
+        fastcgi_param  HTTPS on;
     }
 
     # ---- PRESTASHOP ----
     location ^~ /store/ {
 
-        root /home/www/pp.talentstube.com;
+        root /home/www/website;
         index index.php;
         try_files $uri $uri/ /www/index.php;
 
@@ -113,6 +93,6 @@ server {
 
     sendfile off;
 
-    include /home/www/pp.talentstube.com/conf/redirect.conf;
-    include /home/www/pp.talentstube.com/conf/expires.conf;
+    include /home/www/website/conf/redirect.conf;
+    include /home/www/website/conf/expires.conf;
 }

volume/www/website/conf/nginx-prod.conf

@@ -11,7 +11,7 @@ server {
        server_name static.talentstube.com;
 
        index index.html;
-       root /home/www/www.talentstube.com/www/web/uploads/;
+       root /home/www/website/www/web/uploads/;
 
        access_log /home/www/website/log/access.log vhosts;
        error_log /home/www/website/log/error.log;
@@ -28,7 +28,7 @@ server {
 
     client_max_body_size 500M;
 
-    root /home/www/www.talentstube.com/www/web;
+    root /home/www/website/www/web;
 
     access_log /home/www/website/log/access.log vhosts;
     error_log  /home/www/website/log/error.log;

volume/www/website/conf/redirect.conf

@@ -9,4 +9,7 @@ rewrite  ^/plateforme$  https://www.talentstube.com/ permanent;
 rewrite  ^/page/les-conseils$  https://www.talentstube.com/accompagnement-entreprise permanent;
 rewrite  ^/page/presentation-talent$  https://www.talentstube.com/cv-video permanent;
 rewrite  ^/page/la-plateforme$  https://www.talentstube.com/ permanent;
-rewrite ^/tarifs$ https://www.talentstube.com/accompagnement-entreprise permanent;
+rewrite ^/tarifs$ https://www.talentstube.com/accompagnement-entreprise permanent;
+rewrite ^/annonce/38-charge-de-projets-developpement-h-f$  https://www.talentstube.com/annonce/38-charge-de-projets-developpement-cosmetique-h-f permanent;
+rewrite  ^/annonce/recherche/$  https://www.talentstube.com/annonce/recherche permanent;
+rewrite  ^/territoire/1573-communaute-d-agglomeration-castres-mazamet/$  https://www.talentstube.com/territoire/1573-castres-mazamet/ permanent;

volume/www/website/store/config/settings-prod.inc.php

@@ -1,5 +1,5 @@
 <?php
-define('_DB_SERVER_', 'tt-website.store-php.prod');
+define('_DB_SERVER_', 'tt-website.store-mysql.prod');
 define('_DB_NAME_', 'database');
 define('_DB_USER_', 'user');
 define('_DB_PASSWD_', 'O}lk|45&J,kT+DDM{uk[');

volume/www/website/store/config/xml/blog-fr.xml

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?><rss version="2.0" xml:base="https://www.prestashop.com/fr/blog/feed.xml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:og="http://ogp.me/ns#" xmlns:article="http://ogp.me/ns/article#" xmlns:book="http://ogp.me/ns/book#" xmlns:profile="http://ogp.me/ns/profile#" xmlns:video="http://ogp.me/ns/video#" xmlns:product="http://ogp.me/ns/product#" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:sioc="http://rdfs.org/sioc/ns#" xmlns:sioct="http://rdfs.org/sioc/types#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-  <channel>
-    <title>Blog Feed</title>
-    <link>https://www.prestashop.com/fr/blog/feed.xml</link>
-    <description></description>
-    <language>fr</language>
-     <atom:link href="https://www.prestashop.com/fr/blog/feed.xml" rel="self" type="application/rss+xml" />
-      <item>
-    <title>4 moyens d’augmenter votre taux de conversion grâce à votre page de paiement</title>
-    <link>https://www.prestashop.com/fr/4-moyens-daugmenter-votre-taux-de-conversion-grace-a-votre-page-de-paiement-6</link>
-    <description>Par 
-Dernier contact entre un marchand et son client, nous savons que le check-out est un passage délicat dans le tunnel de conversion.
-</description>
-     <pubDate>Thu, 20 Jul 2017 16:30:04 +0200</pubDate>
- <dc:creator>Anonymous</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/4-moyens-daugmenter-votre-taux-de-conversion-grace-a-votre-page-de-paiement-6</guid>
-  </item>
-  <item>
-    <title>Comment une agence de développement web peut-elle vous être utile ?</title>
-    <link>https://www.prestashop.com/fr/comment-une-agence-de-developpement-web-peut-elle-vous-etre-utile</link>
-    <description>Par 
-Lorsqu’un marchand nous contacte pour la première fois, l’une des questions récurrentes est : &quot;Pourquoi confier ses développements à une agence ?&quot;. Puis, à propos de PrestaShop: &quot;Puisque le logiciel est gratuit, ai-je vraiment besoin d&#039;un prestataire technique ?&quot;.
-</description>
-     <pubDate>Thu, 20 Jul 2017 14:46:24 +0200</pubDate>
- <dc:creator>Anonymous</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/comment-une-agence-de-developpement-web-peut-elle-vous-etre-utile</guid>
-  </item>
-  <item>
-    <title>Rencontrez Nicolas, Ambassadeur du mois | Juillet 2017</title>
-    <link>https://www.prestashop.com/fr/blog/prestashop-ambassadors/rencontrez-nicolas-ambassadeur-du-mois-juillet-2017-2</link>
-    <description>CreaNico est notre Ambassadeur à Montpellier, France, et est très actif dans la région.</description>
-     <pubDate>Tue, 18 Jul 2017 17:27:38 +0200</pubDate>
- <dc:creator>Manon Plommet</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/prestashop-ambassadors/rencontrez-nicolas-ambassadeur-du-mois-juillet-2017-2</guid>
-  </item>
-  <item>
-    <title>Zoom sur l&amp;#039;e-commerce italien</title>
-    <link>https://www.prestashop.com/fr/blog/tendances-e-commerce/zoom-sur-le-commerce-italien</link>
-    <description>Avec un taux de croissance des ventes de 18% en 2016, une base d’acheteurs en ligne de 18 millions de personnes et un panier moyen en augmentation, le e-commerce italie</description>
-     <pubDate>Mon, 17 Jul 2017 18:34:12 +0200</pubDate>
- <dc:creator>vMartelli</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/tendances-e-commerce/zoom-sur-le-commerce-italien</guid>
-  </item>
-  <item>
-    <title>Rentrée, Black Friday, Noël : Téléchargez votre guide e-commerce de fin d&amp;#039;année</title>
-    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/rentree-black-friday-noel-telechargez-votre-guide-e-commerce-de-fin-dannee-1</link>
-    <description>La rentrée, Black Friday, Noël : en quelques mois seulement se joue la majeure partie du chiffre d’affaires de l’activité e-commerce.</description>
-     <pubDate>Mon, 17 Jul 2017 14:28:47 +0200</pubDate>
- <dc:creator>Cécile Dubouis</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/rentree-black-friday-noel-telechargez-votre-guide-e-commerce-de-fin-dannee-1</guid>
-  </item>
-  <item>
-    <title>Lutte contre la fraude à la TVA, allègement de la loi</title>
-    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/lutte-fraude-tva-allegement-loi</link>
-    <description>Suite à notre article Conformité à l’articl</description>
-     <pubDate>Mon, 26 Jun 2017 10:10:00 +0200</pubDate>
- <dc:creator>Mohammed Bellamine</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/lutte-fraude-tva-allegement-loi</guid>
-  </item>
-  <item>
-    <title>Planning et astuces pour créer des promotions efficaces sur PrestaShop</title>
-    <link>https://www.prestashop.com/fr/blog/conseils-e-commerce/planning-et-astuces-pour-creer-des-promotions-efficaces-sur-prestashop</link>
-    <description>Été, rentrée, Black Friday, Noël… Les promotions de fin d’année sont primordiales en e-commerce, mais leur préparation peut être chronophage.</description>
-     <pubDate>Mon, 19 Jun 2017 11:24:19 +0200</pubDate>
- <dc:creator>Cécile Dubouis</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/conseils-e-commerce/planning-et-astuces-pour-creer-des-promotions-efficaces-sur-prestashop</guid>
-  </item>
-  <item>
-    <title>10 ans – 10 interviews « portrait » : Keiko ITO, développeuse web au Japon  </title>
-    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-keiko-ito-developpeuse-web-au-japon</link>
-    <description>Le pitch / Originaire de Kobe, au Japon, Keiko est passionnée par le web et la France.</description>
-     <pubDate>Fri, 16 Jun 2017 16:17:35 +0200</pubDate>
- <dc:creator>Mpierrot</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-keiko-ito-developpeuse-web-au-japon</guid>
-  </item>
-  <item>
-    <title>Rencontrez Claudia, Ambassadrice du mois | Juin 2017</title>
-    <link>https://www.prestashop.com/fr/blog/prestashop-ambassadors/clone-of-meet-claudia-ambassador-of-the-month-june-2017</link>
-    <description>Claudia est notre Ambassadrice à Monterrey, Mexique, et y organise des meetups très régulièrement. Elle est toujours partante pour parler de PrestaShop !</description>
-     <pubDate>Fri, 16 Jun 2017 11:38:21 +0200</pubDate>
- <dc:creator>Manon Plommet</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/prestashop-ambassadors/clone-of-meet-claudia-ambassador-of-the-month-june-2017</guid>
-  </item>
-  <item>
-    <title>10 ans – 10 interviews « portrait » : Corinne Lejbowicz, CEO de PrestaShop</title>
-    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-corinne-lejbowicz-ceo-de-prestashop</link>
-    <description>Le pitch / En 2007, Corinne Lejbowicz est CEO de LeGuide.com, où elle rencontre le jeune Bruno Lévêque.</description>
-     <pubDate>Wed, 14 Jun 2017 15:06:02 +0200</pubDate>
- <dc:creator>Mpierrot</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-corinne-lejbowicz-ceo-de-prestashop</guid>
-  </item>
-  </channel>
-</rss>

volume/www/website/store/config/xml/tab_modules_list.xml

@@ -261,7 +261,7 @@
 </tab>
 <tab class_name="AdminPayment" display_type="default_list">
 <module name="secureframe" position="1"/>
-<module name="paypalmx" position="2"/>
+<module name="paypal" position="13"/>
 <module name="mercadopagobr" position="3"/>
 <module name="payulatam" position="4"/>
 <module name="dotpay" position="5"/>
@@ -272,14 +272,14 @@
 <module name="simplifycommerce" position="10"/>
 <module name="klarnaofficial" position="11"/>
 <module name="spsrsmartsepa" position="12"/>
-<module name="oyst" position="13"/>
-<module name="ewayrapid" position="14"/>
-<module name="fcpayone" position="15"/>
-<module name="pagseguro" position="16"/>
-<module name="ewayrapid" position="17"/>
-<module name="hipay" position="18"/>
-<module name="ogone" position="19"/>
-<module name="payplug" position="20"/>
+<module name="payplug" position="2"/>
+<module name="oyst" position="14"/>
+<module name="ewayrapid" position="15"/>
+<module name="fcpayone" position="16"/>
+<module name="pagseguro" position="17"/>
+<module name="ewayrapid" position="18"/>
+<module name="hipay" position="19"/>
+<module name="ogone" position="20"/>
 <module name="realexredirect" position="21"/>
 <module name="stripe_official" position="22"/>
 <module name="skrill" position="23"/>

volume/www/website/store/config/xml/untrusted_modules_list.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<modules_list><modules type="untrusted"><module name="blockreinsurance"/><module name="etransactions"/><module name="trackingfront"/></modules></modules_list>

volume/www/website/store/themes/talentstube-20170413/cache/v_29_65fa0811aee897efa910cda0a6dda4c6_print.css

@@ -1,2 +0,0 @@
-@charset "UTF-8";
-@media only print{#header .nav,#header .banner,#header .row > div{display:none}#header .row div#header_logo{display:block}#center_column{width:100% !important}#left_column,#right_column{display:none}.no-print,#quantity_wanted_p > a,a.quick-view{display:none !important}div.selector,div.selector span,div.selector select{background:none}#thumbs_list li a:hover,#thumbs_list li a.shown{border-color:#fff}.product_attributes,.box-cart-bottom{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none}.pb-left-column #views_block{margin-top:10px;width:278px !important}#thumbs_list_frame,#thumbs_list{width:100% !important;height:100% !important}#thumbs_list li,#thumbs_list li:first-child{margin:4px;width:82px;height:82px}#view_scroll_left,#view_scroll_right,.view_scroll_spacer{display:none !important}.bx-wrapper{width:100% !important;max-width:100% !important}.bx-viewport{height:auto !important}#bxslider,#bxslider1,#crossselling_list_car{width:100% !important;height:auto !important;overflow:visible !important}#bxslider1 .product-box{min-height:200px}.bx-controls-direction{display:none}#footer .row > div,#footer .row > section{display:none}#footer .row > div#block_contact_infos,#footer .row > section#block_contact_infos{display:block;width:100%;border-left:none;border-top:1px solid #515151;padding-top:20px}.footer-container #footer h4:after{display:none}}