#7781 @1

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index 931089ba89d9c469ab0506596e40b2c2cac62cba..ad231ebcb5eb53e1cc8a9a59ab36ee916e2d9700 100644 (file)
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.1'
 services:
     webserver:
         container_name: pmi-dev-httpd
@@ -122,5 +121,5 @@ services:
 
 networks:
   pmi-dev:
-    external:
-      name: pmi-dev
+    name: pmi-dev
+    external: true

diff --git a/.docker/dev/terminal.bat b/.docker/dev/terminal.bat
index 57b33ddb273cceb90e89ff05d20e0a9a47045c77..cb45a8d294c793d6facd5bc51ff821fcfa22f63c 100644 (file)
--- a/.docker/dev/terminal.bat
+++ b/.docker/dev/terminal.bat
@@ -1,3 +1,3 @@
 @echo off
 cls
-ssh -t root@godzilla.cubedesigners.com 'chown root:root /docker/pmi-dev/config/sudoers;docker exec -it -u pmi-dev pmi-dev /bin/bash'
+ssh -t root@cloudatlas.cubedesigners.com 'chown root:root /docker/pmi-dev/config/sudoers;docker exec -it -u pmi-dev pmi-dev /bin/bash'

diff --git a/.docker/dev/update b/.docker/dev/update
index a2f22829cca52cc075488ca7cc19ab664626fe2d..215f09e702533ee4712c8df00a64b2ecf043304b 100644 (file)
--- a/.docker/dev/update
+++ b/.docker/dev/update
@@ -16,3 +16,4 @@ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
 docker compose down -v
 rm ./database/data/tc.log
 docker compose up -d
+docker stop pmi-dev-mariadb;rm database/data/tc.log;docker start pmi-dev-mariadb

diff --git a/.docker/production/update b/.docker/production/update
index 6b847323204d79fbd1d15eec77420646cf220e29..ea414755133b5b4d427deacd9cfadfcc8eec0ac5 100644 (file)
--- a/.docker/production/update
+++ b/.docker/production/update
@@ -12,6 +12,7 @@ chmod -R 777 ./redis
 docker network create pmi
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
-docker compose down
+docker compose down -v
+rm ./database/data/tc.log
 docker compose up -d
 docker stop pmi-mariadb;rm database/data/tc.log;docker start pmi-mariadb

diff --git a/.env.dev b/.env.dev
index cc07b24076d22b4e2bbeb0de3316ffacfb58be8a..ccbfb93f66f0a368e5c79f52f1e61583eefc56ee 100644 (file)
--- a/.env.dev
+++ b/.env.dev
@@ -8,7 +8,7 @@ APP_VARIANTS=PMI,MICHSCI
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST=pmi-dev-mariadb
+DB_HOST=mariadb
 DB_PORT=3306
 DB_DATABASE=pmi-dev
 DB_USERNAME=root
@@ -26,14 +26,15 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=in-v3.mailjet.com
-MAIL_PORT=587
-MAIL_USERNAME=ca110b35f8735c223d69c9987c2ac47d
-MAIL_PASSWORD=b289d0acb08e0fe56ce98ccf0dd1ed8b
-MAIL_ENCRYPTION=tls
+
+MAIL_ENCRYPTION=false
+MAIL_HOST=postal.cubedesigners.com
+MAIL_PORT=25
+MAIL_USERNAME=pmi/pmi-dev
+MAIL_PASSWORD=tTtsxizqUImeNdoU2Xu2VVKu
 MAIL_FROM_ADDRESS=web@pm-instrumentation.com
 MAIL_FROM_NAME="PM-Instrumentation"
-MAIL_TO_ADDRESS=soufiane@cubedesigners.com
+MAIL_TO_ADDRESS=test+pmi@cubedesigners.com
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

diff --git a/.env.production b/.env.production
index 28f8b8736e201286b9fd8f42ffb337f6e4d19585..31e2447de9e3647d0fdec4333c9a990d09c98a95 100644 (file)
--- a/.env.production
+++ b/.env.production
@@ -45,6 +45,8 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
+PWA_COLOR=152f4e
+
 SEO_ROBOTS=true
 
 GOOGLE_ANALYTICS_ID=UA-11105497-1