From 541ddd1b350a32d432e507afcd1241019748b3f0 Mon Sep 17 00:00:00 2001 From: davidmolinacano Date: Tue, 5 Sep 2023 15:47:26 +0200 Subject: [PATCH] feat: removed blank line from a file --- .gitignore | 4 +++- docker-compose.yml | 28 ++++++++++++++++++++++------ lib/dfTools.class.php | 1 - 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 24afe3f..ab2cda5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,6 @@ test_doofinder.php vendor/ composer.lock .php-cs-fixer.dist.php -.php-cs-fixer.cache \ No newline at end of file +.php-cs-fixer.cache +/html +/html/** diff --git a/docker-compose.yml b/docker-compose.yml index 8ea9323..90b5df5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,22 +11,38 @@ services: MYSQL_PASSWORD: prestashop MYSQL_ROOT_PASSWORD: prestashop ports: - - 3308:3306 - container_name: local-prestashop-mysql + - 3311:3306 + container_name: local-prestashop-1.7-mysql prestashop: depends_on: - db image: prestashop/prestashop:1.7 ports: - - 9000:80 - - 443:443 + - 9011:80 + - 9445:443 environment: PS_DB_HOST: db:3306 PS_DB_USER: prestashop PS_DB_PASSWORD: prestashop volumes: - ./html:/var/www/html - container_name: local-web-prestashop + container_name: local-web-prestashop-1.7 + + # PhpMyAdmin container + phpmyadmin: + depends_on: + - db + image: phpmyadmin/phpmyadmin + container_name: local-prestashop-1.7-phpmyadmin + environment: + PMA_HOST: db + PMA_PORT: 3306 + PMA_USER: prestashop + PMA_PASSWORD: prestashop + ports: + - 8094:80 + links: + - db volumes: - data: \ No newline at end of file + data: diff --git a/lib/dfTools.class.php b/lib/dfTools.class.php index 43b955b..77bfa08 100644 --- a/lib/dfTools.class.php +++ b/lib/dfTools.class.php @@ -1,5 +1,4 @@