diff --git a/.DS_Store b/.DS_Store index 633d2bc17bc4adf726d4c2a993e740302ddd774f..5c9f562f83b691f9ef5db23052bee8092ba5c29c 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/docker-compose.yaml b/docker-compose.yaml index b98cc4dd9f8bae689d75d40e0120de1dd5caca78..a578e8b4432ab2c8b4abbf305abff79d520a8e34 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,9 +1,9 @@ version: '3' services: - db: + userdb: image: mysql:8.0 - container_name: db + container_name: user_db volumes: - dbdata:/var/lib/mysql command: --default-authentication-plugin=mysql_native_password @@ -22,7 +22,7 @@ services: image: php:7.2.2-apache container_name: php_web depends_on: - - db + - userdb volumes: - ./php/:/var/www/html/ ports: @@ -30,5 +30,23 @@ services: stdin_open: true tty: true + recipedb: + image: mysql:8.0 + container_name: recipe_db + volumes: + - recipedata:/var/lib/mysql + command: --default-authentication-plugin=mysql_native_password + restart: always + environment: + MYSQL_ROOT_PASSWORD: reciperoot + MYSQL_DATABASE: recipedb + MYSQL_USER: recipe_user + MYSQL_PASSWORD: recipe_user + ports: + - "9907:3306" + expose: + - "9907" + volumes: - dbdata: \ No newline at end of file + dbdata: + recipedata: \ No newline at end of file diff --git a/php/config.php b/php/config.php index 8711b0c3264d183a80a00949c6d5497cae522bb2..21d1038746dbdcade93a40af5d83d1c3014478e6 100644 --- a/php/config.php +++ b/php/config.php @@ -1,6 +1,6 @@ <?php //Database credentials -define('DB_SERVER', 'db'); +define('DB_SERVER', 'userdb'); define('DB_USERNAME', 'service_user'); define('DB_PASSWORD', 'service_user'); define('DB_NAME', 'userdb');