From 3fc236eab287828eb39f4064764500e0f2053fce Mon Sep 17 00:00:00 2001
From: "Yankova, Liliya (UG - Computer Science)" <ly00240@surrey.ac.uk>
Date: Thu, 22 Apr 2021 20:50:53 +0100
Subject: [PATCH] Added a new mysql container for recipe service

---
 .DS_Store           | Bin 6148 -> 6148 bytes
 docker-compose.yaml |  26 ++++++++++++++++++++++----
 php/config.php      |   2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 633d2bc17bc4adf726d4c2a993e740302ddd774f..5c9f562f83b691f9ef5db23052bee8092ba5c29c 100644
GIT binary patch
delta 91
zcmZoMXfc@J&&awlU^gQp>tr4#PgO1k7lwR>WQJ^pRE8pkG=@xu9EMcSoc!dZoctsP
v1_l8J21eP*ZcL{|3@r?F6pRc^YjqT=%}q^p6if|_HmfqPW7*8k@s}R};0hJb

delta 60
zcmZoMXfc@J&&aYdU^gQp%VZuV&&lhV*e6e5+A3mdVydHHWNKckqfl*bZmy$XVs5%Q
Ql6f7=#0Hbi>>Pjj0SvPdV*mgE

diff --git a/docker-compose.yaml b/docker-compose.yaml
index b98cc4d..a578e8b 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 8711b0c..21d1038 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');
-- 
GitLab