From 7f54e745848fec378f0c0dfaae404e92d0df17b0 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 26 Mar 2025 12:38:18 +0100 Subject: [PATCH] wip #7378 @1.5 --- .docker/dev/docker-compose.yml | 6 +++--- .docker/syncprodtodev | 13 +++++++++++++ .docker/syncprodtodev.exclude | 2 ++ framework/application/configs/application.ini | 6 +----- 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 .docker/syncprodtodev create mode 100644 .docker/syncprodtodev.exclude diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml index 5495b33..9055183 100644 --- a/.docker/dev/docker-compose.yml +++ b/.docker/dev/docker-compose.yml @@ -67,8 +67,8 @@ services: image: 'mariadb:latest' restart: unless-stopped environment: - MARIADB_ROOT_PASSWORD: DrNmo8VaNLTEWaX3 - MARIADB_DATABASE: dtlc-dev + MARIADB_ROOT_PASSWORD: PgjM7RGykgh3P7Cw + MARIADB_DATABASE: dtlc MARIADB_AUTO_UPGRADE: 1 volumes: - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql" @@ -90,7 +90,7 @@ services: - "./database/backup:/backup" environment: USERNAME: root - PASSWORD: DrNmo8VaNLTEWaX3 + PASSWORD: PgjM7RGykgh3P7Cw DBHOST: dtlc-dev-mariadb DBEXCLUDE: "performance_schema information_schema" CRON_SCHEDULE: "0 0 * * *" diff --git a/.docker/syncprodtodev b/.docker/syncprodtodev new file mode 100644 index 0000000..0bdc9aa --- /dev/null +++ b/.docker/syncprodtodev @@ -0,0 +1,13 @@ +#!/bin/sh +rsync -avz --delete --exclude-from /home/dtlc/dev/.docker/syncprodtodev.exclude --delete-excluded /home/dtlc/www/files/ /home/dtlc/dev/files/ +# Sync database +docker stop dtlc-dev-mariadb +rm -rf /docker/dtlc-dev/database/data/* +rsync -avz /docker/dtlc/database/data/ /docker/dtlc-dev/database/data/ +docker stop dtlc-mariadb +rsync -avz /docker/dtlc/database/data/ /docker/dtlc-dev/database/data/ +sleep 1 +rsync -avz /docker/dtlc/database/data/ /docker/dtlc-dev/database/data/ +docker start dtlc-mariadb +# Update and restart dev containers +/docker/dtlc-dev/update diff --git a/.docker/syncprodtodev.exclude b/.docker/syncprodtodev.exclude new file mode 100644 index 0000000..f81cdd7 --- /dev/null +++ b/.docker/syncprodtodev.exclude @@ -0,0 +1,2 @@ +processed +rasterized \ No newline at end of file diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini index aa55734..2e3e626 100644 --- a/framework/application/configs/application.ini +++ b/framework/application/configs/application.ini @@ -74,15 +74,11 @@ firephp = false httpauth.username = dtlc httpauth.password = dtlc17 -httpauth.ip_whitelist[] = 88.190.245.49 -httpauth.ip_whitelist[] = 91.121.74.76 +httpauth.ip_whitelist[] = 176.134.43.17 httpauth.excludepath = /payment/auto httpauth.excludepath = /sogecommerce/auto database.params.host = dtlc-dev-mariadb -database.params.password = DrNmo8VaNLTEWaX3 -database.params.dbname = dtlc-dev - sogenactif.url = https://payment-webinit.simu.sips-atos.com/paymentInit sogenactif.key = 002001000000001_KEY1 sogenactif.key_version = 1 -- 2.39.5