add Dockerfile

Dockerfile

@@ -0,0 +1,27 @@
+# Use an official node version as a parent image
+FROM node:11.12.0
+
+# Create app directory
+RUN mkdir -p /src/app
+WORKDIR /src/app
+
+# Install any needed packages specified in requirements.txt
+COPY package.json /src/app/
+RUN npm install
+
+# Bundle app source
+COPY . /src/app
+
+# Make port 8000 available to the world outside this container
+EXPOSE 3000
+
+# Define environment variable
+#ENV DEBUG True
+
+VOLUME ["/var/lib/docker/volumes/jtmVol"]
+
+# Run
+#CMD ["node", "index.js"]
+#CMD ["npm", "run", "start"]
+#CMD ["npm", "run", "debug"]
+CMD ["npm", "run", "server"]

README.md

@@ -10,42 +10,23 @@ git clone https://github.com/iMelki/Json2MySQL.git
 
 
 ### Prerequisites
-Node.js
-
-
-### Installing
-Download & Install [Node.js](https://nodejs.org/en/)
-Go to the directory of the app
-Enter the command:
-```
-npm install
-```
-
+Download & Install [Docker](https://www.docker.com/get-started)
 
 
 ## Running the app
-Before first run:  
-Go to the directory of the app.  
+Navigate to the directory of the app. 
+
+Before first run:   
 Open the configuration file (config.json) and edit it with the arguments of your choise.  
 Choose a database table that fits the Schema, or choose a non-existing one to be created.  
-
-Now, this command will run the app on your local machine:
 
+
+To build & run the app, enter the command:
 ```
-node index.js [%file_path% [%DB_name% [%table_name%]]]
-```
-
-Note: to see app's progress with debug comments in the console:
+docker-compose up
 ```
-SET DEBUG=* & node index.js [%file_path% [%DB_name% [%table_name%]]]
-``` 
-
-Where %filePath% should be replaced with the input JSON file path,  
-%DB_name% should be replaced with the database name  
-and %table_name% should be replaced with the table name.  
-They're not mandatory. If not specified, they'll be taken from the configuration file instead.  
-
 
+
 
 ## Author
 * **iMelki** 

app.js

@@ -0,0 +1,46 @@
+/*
+//Outers:
+const express = require('express');
+var createError = require('http-errors');
+var path = require('path');
+var debug = require('debug')('app');
+
+//Insiders:
+const jsonToMySQL = require('./jsonToMySQL.js');
+var indexRouter = require('./routes/index');
+
+
+const app = express();
+
+const port = 3000;
+app.listen(port, () => console.log(`Example app listening on port ${port}!`));
+
+const data = jsonToMySQL.startScript();
+
+//Set up MySQL connection:
+// currently in the original file
+
+// view engine setup
+app.set('views', path.join(__dirname, 'views'));
+app.set('view engine', 'pug');
+
+app.use('/', indexRouter);
+
+// catch 404 and forward to error handler
+app.use(function(req, res, next) {
+    next(createError(404));
+});
+
+// error handler
+app.use(function(err, req, res, next) {
+    // set locals, only providing error in development
+    res.locals.message = err.message;
+    res.locals.error = req.app.get('env') === 'development' ? err : {};
+
+    // render the error page
+    res.status(err.status || 500);
+    res.render('error');
+});
+
+module.exports = app;
+*/

cf-docker-compose.yml

@@ -0,0 +1,43 @@
+version: '2'
+services:
+  db:
+    image: mysql:5.7
+    restart: always
+    environment:
+      MYSQL_DATABASE: 'db'
+      MYSQL_USER: 'user'
+      MYSQL_PASSWORD: 'password'
+      MYSQL_ROOT_PASSWORD: 'password'
+#    ports:
+#      - '3306:3306'
+    ports:
+      - '3306'
+    volumes:
+      - jtmVol:/var/lib/docker/volumes/jtmVol
+      #- my-db:/var/lib/mysql
+
+  # client:
+  #   image: ${{MyClientDockerImage}}
+  #   expose:
+  #     - '4200'
+#   image: my-app-ui
+#   ports:
+#     - 4200:4200
+
+  server:
+    image: ${{MyServerDockerImage}}
+    ports:
+      - '3000'
+    environment:
+      MYSQL_DATABASE: db.MYSQL_DATABASE
+      MYSQL_USER: db.MYSQL_USER
+      MYSQL_PASSWORD: db.MYSQL_PASSWORD
+      MYSQL_ROOT_PASSWORD: db.MYSQL_ROOT_PASSWORD
+#    ports:
+#      - 3000:3000
+
+    #build: .
+
+
+volumes:
+  jtmVol:

codefresh.yml

@@ -0,0 +1,61 @@
+version: '1.0'
+
+stages:
+  - test
+
+steps:
+
+  MyServerDockerImage:
+    title: Building Server Docker Image
+    type: build
+    image_name: ilancodefresh/json2mysql
+    working_directory: ./
+    tag: '${{CF_BRANCH_TAG_NORMALIZED}}'
+    dockerfile: Dockerfile
+
+#  MyClientDockerImage:
+#    title: Building Client Docker Image
+#    type: build
+#    image_name: ilancodefresh/my-app-ui
+#    working_directory: ./
+#    tag: '${{CF_BRANCH_TAG_NORMALIZED}}'
+#    dockerfile: Dockerfile
+
+  MyUnitTests:
+    title: Running Unit tests
+    stage: test
+    image: ${{MyServerDockerImage}}
+    commands:
+      - npm run test
+
+  PushToDH:
+    type: push
+    title: Push Image to Docker Hub
+    description: Push Docker Image to Docker Hub Registry
+    candidate: ${{MyServerDockerImage}}
+    #tag: latest
+    #image_name: codefresh/app
+    registry: dockerhub
+    fail_fast: false
+    when:
+      branch:
+        only:
+          - master
+    retry:
+      maxAttempts: 2
+      delay: 5
+
+  Run:
+    type: launch-composition
+    title: Run app
+    description: Free text description
+    working_directory: ./
+    entry_point: server
+    environment_name: Json2MySQL
+    composition: cf-docker-compose.yml
+
+#   Run:
+#     title: Running Server
+#     image: ${{MyServerDockerImage}}
+#     commands:
+#       - docker-compose up

codefresh1.yml

@@ -0,0 +1 @@
+{}

codefresh2.yml

@@ -0,0 +1,9 @@
+version: '1.0'
+steps:
+  BuildingDockerImage:
+    titlee: Building Docker Image
+    type: build
+    image_name: ilancodefresh/json2mysql
+    working_directory: ./
+    tag: '${{CF_BRANCH_TAG_NORMALIZED}}'
+    dockerfile: Dockerfile

config.js

@@ -5,12 +5,13 @@ var configData = require('./config.json');
 
 debug('imported');
 
-var jsonPath;
-var host;
-var user;
-var password;
-var dbName;
-var tblName;
+let jsonPath;
+let host;
+let user;
+let password;
+let rootPassword;
+let dbName;
+let tblName;
 
 function initConfig(){
     jsonPath = path.resolve(__dirname,  configData.jsonPath);
@@ -25,4 +26,11 @@ initConfig();
 
 module.exports = {
     host, user, password, jsonPath, dbName, tblName
-}
+}
+
+exports.initDbParams = function(dbNameStr, username, pass, rootPass){
+    user = username;
+    password = pass;
+    rootPassword = rootPass;
+    dbName = dbNameStr;
+}

config.json

@@ -1,8 +1,8 @@
 {
+    "host" : "192.168.99.104",
     "jsonPath" : "./inputs/accounts.json",
-    "host" : "localhost",
     "user" : "root",
-    "password" : "root",
+    "password" : "123",
     "dbName" : "accountsDB",
     "tblName" : "accounts"
-}
+}

controllers/accountController.js

@@ -0,0 +1,51 @@
+
+const debug = require('debug')('AccountController');
+
+// Require App Logic:
+const jsonToMySQL = require('../jsonToMySQL');
+
+//const jsonToDB = () => {
+async function jsonToDB(){
+    jsonToMySQL
+        .startScript(
+            process.env.MYSQL_DATABASE,
+            process.env.MYSQL_USER,
+            process.env.MYSQL_PASSWORD,
+            process.env.MYSQL_ROOT_PASSWORD
+        )
+        .then(() => {
+            console.log('finished insertion script.');
+        })
+        .catch(err => {
+            console.error(err.message);
+        });
+}
+
+async function getDataFromDB(){
+    jsonToMySQL
+        .getAllAccounts()
+        .then(data=>{return data;})
+        .catch(err => console.error(err));
+}
+
+exports.index = async function(req, res, next) {
+    //res.send("Account Controller with logic");
+    //res.send("YO ! "+process.env.MYSQL_PASSWORD.toString());
+    let status = await jsonToDB();
+    debug(status);
+
+    let data = getDataFromDB();
+    //return data;
+    res.send(data);
+    //res.render('index', { title: 'Express' });
+};
+
+
+
+/*
+
+      MYSQL_DATABASE: 'db'
+      MYSQL_USER: 'user'
+      MYSQL_PASSWORD: 'password'
+      MYSQL_ROOT_PASSWORD: 'password'
+ */