From d9246bd7c083581632e0a24e4c5e30024e7604dc Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Sat, 17 Feb 2018 18:22:27 +0100 Subject: [PATCH] +updated 'mariadb' service configuration +removed temp. vhost folder --- docker-compose.yml | 8 ++------ virtual/vhost/public_html/index.html | 12 ------------ virtual/vhost/public_html/index.php | 23 ----------------------- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100755 virtual/vhost/public_html/index.html delete mode 100755 virtual/vhost/public_html/index.php diff --git a/docker-compose.yml b/docker-compose.yml index 889cd0a..b897234 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,13 +9,9 @@ services: - overlay environment: MYSQL_ROOT_PASSWORD: root - MYSQL_DATABASE: db1 + MYSQL_DATABASE: vhost MYSQL_USER: php - MYSQL_PASSWORD: php-password - # volumes: - # - ./virtual/usr/local/etc/php-fpm.d/www.conf:/usr/local/etc/php-fpm.d/www.conf - # - ./virtual/var/log/php-fpm:/var/log/php-fpm - # - ./virtual/vhost:/vhost + MYSQL_PASSWORD: 4JB1dtbrIC8pT935 expose: - '3306' diff --git a/virtual/vhost/public_html/index.html b/virtual/vhost/public_html/index.html deleted file mode 100755 index f45ddc0..0000000 --- a/virtual/vhost/public_html/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - HTML ex - - - - - \ No newline at end of file diff --git a/virtual/vhost/public_html/index.php b/virtual/vhost/public_html/index.php deleted file mode 100755 index 320eef1..0000000 --- a/virtual/vhost/public_html/index.php +++ /dev/null @@ -1,23 +0,0 @@ - 10]); - - // On signale que tout s'est bien passe - echo "Connected to database"; - - }catch(Exception $e){ - // On signale qu'il y a une erreur - echo "Cannot connect to database"; - - echo "msg: ".$e->getMessage(); - } - - - phpinfo(); \ No newline at end of file