Merge pull request #55 from bvkatwijk/add_docker_compose

Add docker compose

README.md

@@ -1065,16 +1065,7 @@ When you start your nginx proxy in a docker container too, use as `proxy_pass` t
 
 # Tests : setup on local machine
 [:arrow_heading_up:](#api-overview)
-
-Login to mysql shell
-
-```
-mysql> create database classicmodels
-mysql> use classicmodels
-mysql> source path_to/xmysql/tests/sample.sql
 ```
-
-```
-$ mocha tests/*.js --exit
+docker-compose run test
 ```
-
+* Requires `docker-compose` to be installed on your machine.

dev.Dockerfile

@@ -0,0 +1,20 @@
+FROM frolvlad/alpine-python2
+
+RUN apk --update --no-cache add \
+	g++ \
+	make \
+	nodejs \
+	nodejs-npm \
+	paxctl \
+	&& paxctl -cm $(which node)
+
+WORKDIR /usr/src/app
+
+COPY package.json .
+RUN npm install
+
+COPY . .
+
+ENTRYPOINT ["./docker-entrypoint.sh"]
+
+CMD ["sh", "-c", "node index.js -h $DATABASE_HOST -p $DATABASE_PASSWORD -d $DATABASE_NAME -u $DATABASE_USER -n 80 -r 0.0.0.0"]

docker-compose.yml

@@ -0,0 +1,38 @@
+version: '3.5'
+
+services:
+  db:
+    image: mysql:5.7
+    restart: always
+    command: --init-file /docker-entrypoint-initdb.d/sample.sql
+    environment:
+      MYSQL_ROOT_PASSWORD: 'pass'
+      MYSQL_USER: 'root'
+      MYSQL_PASSWORD: 'pass'
+      MYSQL_DATABASE: 'classicmodels'
+    volumes:
+      - ./tests/docker-sample.sql:/docker-entrypoint-initdb.d/sample.sql
+      - db-data:/var/lib/mysql
+    ports:
+      - "3306:3306"
+
+  db-api: &db-api
+    build:
+      context: ./
+      dockerfile: ./dev.Dockerfile
+    environment:
+      DATABASE_HOST: 'db'
+      DATABASE_USER: 'root'
+      DATABASE_PASSWORD: 'pass'
+      DATABASE_NAME: 'classicmodels'
+    ports:
+      - "3002:80"
+    depends_on:
+      - db
+
+  test:
+    <<: *db-api
+    command: sh -c "npm test"
+
+volumes:
+  db-data:

docker-entrypoint.sh

@@ -12,5 +12,4 @@ done
 
 echo "Mysql is up - executing command"
 
-cd /usr/src/app/
-node index.js -h $DATABASE_HOST -p $DATABASE_PASSWORD -d $DATABASE_NAME -u $DATABASE_USER -n 80 -r 0.0.0.0
+exec "$@"

tests/tests.js

@@ -23,10 +23,10 @@ describe('xmysql : tests', function () {
 
   before(function (done) {
 
-    args['host'] = 'localhost'
-    args['user'] = 'root'
-    args['password'] = ''
-    args['database'] = 'classicmodels'
+    args['host'] = process.env.DATABASE_HOST || 'localhost'
+    args['user'] = process.env.DATABASE_USER || 'root'
+    args['password'] = process.env.DATABASE_PASSWORD || ''
+    args['database'] = process.env.DATABASE_NAME || 'classicmodels'
     args['apiPrefix'] = apiPrefix
 
     cmdargs.handle(args)
@@ -697,6 +697,7 @@ describe('xmysql : tests', function () {
       });
   });
 
+  if(args['host'] === 'localhost') {
     it('POST /dynamic should PASS', function (done) {
 
       var obj = {};
@@ -773,6 +774,7 @@ describe('xmysql : tests', function () {
 
         });
     });
+  }
 
 
   it('PATCH /api/productlines/Hyperloop should PASS', function (done) {