From 64f15fe51720694c287a968dd1ebfa9472cfced3 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 9 Oct 2025 14:39:49 +0200 Subject: [PATCH] #7781 @1 --- .docker/dev/docker-compose.yml | 5 ++--- .docker/dev/terminal.bat | 2 +- .docker/dev/update | 1 + .docker/production/update | 3 ++- .env.dev | 15 ++++++++------- .env.production | 2 ++ 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml index 931089b..ad231eb 100644 --- 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 57b33dd..cb45a8d 100644 --- 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 a2f2282..215f09e 100644 --- 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 6b84732..ea41475 100644 --- 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 cc07b24..ccbfb93 100644 --- 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 28f8b87..31e2447 100644 --- 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 -- 2.39.5