diff --git a/.env b/.env index 9666853..d7d81fe 100644 --- a/.env +++ b/.env @@ -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 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8a9d01f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +base_d7/* +log/* diff --git a/base_d7/.keepme b/base_d7/.keepme new file mode 100644 index 0000000..e69de29 diff --git a/base_d7/index.php b/base_d7/index.php deleted file mode 100644 index 0cc0a9c..0000000 --- a/base_d7/index.php +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Test nginx docker - - -

Hello world!

- - - diff --git a/docker-compose.yml b/docker-compose.yml index e4503ac..a98cf22 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: diff --git a/log/.keepme b/log/.keepme new file mode 100644 index 0000000..e69de29 diff --git a/php/Dockerfile b/php/Dockerfile index d6e9ff1..e02f76c 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -1,3 +1,3 @@ FROM php:5.6-fpm -# RUN docker-php-ext-install pdo_mysql +RUN docker-php-ext-install pdo_mysql