mysql is working

2018-01-13 16:17:09 +01:00
parent 66457e6eb2
commit f1f25d080d
7 changed files with 26 additions and 19 deletions
@@ -1,7 +1,7 @@
 PROJECT_ROOT=./base_d7
 LOG_ROOT=./log

-DB_ROOT_PASSWORD=project
-DB_NAME=project
-DB_USERNAME=project
-DB_PASSWORD=project
+DB_ROOT_PASSWORD=materio
+DB_NAME=materio_base_d7
+DB_USERNAME=materio
+DB_PASSWORD=materio
@@ -0,0 +1,2 @@
+base_d7/*
+log/*
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Test nginx docker</title>
-  </head>
-  <body>
-    <h1>Hello world!</h1>
-    <?php phpinfo(); ?>
-  </body>
-</html>
@@ -20,10 +20,26 @@ services:
        volumes:
            - "${PROJECT_ROOT}:/var/www/html"
        networks:
-            # - database
+            - database
            - server
-        # depends_on:
-        #     - mysql
+        depends_on:
+            - mysql
+
+    mysql:
+        image: mariadb:latest
+        volumes:
+            - data:/var/lib/mysql
+        networks:
+            - database
+        environment:
+            MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}"
+            MYSQL_DATABASE: "${DB_NAME}"
+            MYSQL_USER: "${DB_USERNAME}"
+            MYSQL_PASSWORD: "${DB_PASSWORD}"
+
+volumes:
+    data:

 networks:
+    database:
    server:
@@ -1,3 +1,3 @@
 FROM php:5.6-fpm

-# RUN docker-php-ext-install pdo_mysql
+RUN docker-php-ext-install pdo_mysql