From 28ccaba8956a6bd8ddb87360315e18de68c4411a Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Fri, 30 Jul 2021 12:45:32 +0300
Subject: [PATCH] docker container changes

---
 .dockerignore                           |  3 ++-
 Dockerfile                              | 10 +---------
 docker-compose.yml                      |  8 ++++----
 mysql/Dockerfile                        |  6 ++++++
 {logs => mysql/logs}/devicemessages.csv |  0
 package.json                            |  3 +--
 6 files changed, 14 insertions(+), 16 deletions(-)
 create mode 100644 mysql/Dockerfile
 rename {logs => mysql/logs}/devicemessages.csv (100%)

diff --git a/.dockerignore b/.dockerignore
index 19f61b8..899a72b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,4 +3,5 @@ npm-debug.log
 docs
 mysql.txt
 test.js
-mysql
\ No newline at end of file
+mysql
+
diff --git a/Dockerfile b/Dockerfile
index ca06be1..80a2241 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,12 +4,4 @@ COPY package*.json ./
 RUN npm install
 COPY . .
 CMD npm start
-EXPOSE 8055
-
-#
-FROM mysql
-
-ENV MYSQL_DATABASE iot
-ENV MYSQL_ROOT_PASSWORD mitko2021
-
-COPY schema.sql /docker-entrypoint-initdb.d/
\ No newline at end of file
+EXPOSE 2080
diff --git a/docker-compose.yml b/docker-compose.yml
index 1403c3c..997e043 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,13 +4,13 @@ services:
     node-app:
         build: .
         environment:
-            - DATABASE_HOST=db
+            - DATABASE_HOST=node-mysql
         depends_on:
-            - db
+            - node-mysql
         restart: always
         ports:
-            - 8055:8055
-    db:
+            - 2080:2080
+    node-mysql:
         build: ./mysql
         restart: always
         environment:
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
new file mode 100644
index 0000000..89158c0
--- /dev/null
+++ b/mysql/Dockerfile
@@ -0,0 +1,6 @@
+FROM mysql
+
+ENV MYSQL_DATABASE iot
+ENV MYSQL_ROOT_PASSWORD mitko2021
+
+COPY schema.sql /docker-entrypoint-initdb.d/
\ No newline at end of file
diff --git a/logs/devicemessages.csv b/mysql/logs/devicemessages.csv
similarity index 100%
rename from logs/devicemessages.csv
rename to mysql/logs/devicemessages.csv
diff --git a/package.json b/package.json
index 4e0eb51..78976ba 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "dev": "nodemon dht.js",
-    "start": "node dht.js"
+    "start": "node index.js"
   },
   "repository": {
     "type": "git",
@@ -40,7 +40,6 @@
     "mqtt": "^4.1.0",
     "mysql": "^2.18.1",
     "mysql2": "^2.1.0",
-    "n": "^6.5.1",
     "node-cron": "^2.0.3",
     "node-uuid": "^1.4.8",
     "passport": "^0.4.1",