Home Explore Help
Sign In
bachir
/
docker-materio
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

mysql is working

Bachir Soussi Chiadmi 6 years ago
parent
66457e6eb2
commit
f1f25d080d
7 changed files with 26 additions and 19 deletions
Split View Show Diff Stats
  1. 4 4
      .env
  2. 2 0
      .gitignore
  3. 0 0
      base_d7/.keepme
  4. 0 11
      base_d7/index.php
  5. 19 3
      docker-compose.yml
  6. 0 0
      log/.keepme
  7. 1 1
      php/Dockerfile

+ 4 - 4
.env
View File 

@@ -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

+ 2 - 0
.gitignore
View File 

@@ -0,0 +1,2 @@
 
+base_d7/*
 
+log/*

+ 0 - 0
base_d7/.keepme
View File


+ 0 - 11
base_d7/index.php
View File 

@@ -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>

+ 19 - 3
docker-compose.yml
View File 

@@ -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:

+ 0 - 0
log/.keepme
View File


+ 1 - 1
php/Dockerfile
View File 

@@ -1,3 +1,3 @@
 
 FROM php:5.6-fpm
 
 
-# RUN docker-php-ext-install pdo_mysql
 
+RUN docker-php-ext-install pdo_mysql