Serve the API with Express (#150)

* Serve the API with Express * Replace config by convict * Add Dockerfile and now.json
marmelab · May 15, 2019 · 0cf399c · 0cf399c
1 parent 38d5b98
commit 0cf399c
Show file tree

Hide file tree

Showing 21 changed files with 877 additions and 592 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ before_install:
     - psql -c 'create database comfy;' -U postgres
     - psql -U postgres comfy < api/var/schema.sql
 
-install: make install migrate
+install: make install
 script: make test
 
 cache:

diff --git a/Makefile b/Makefile
@@ -7,12 +7,8 @@ install:
 	make -C cli install
 	make -C test install
 
-migrate:
-	make -C api migrate
-
 run:
 	-make -C api start-db
-	make migrate
 	make -C api run
 
 test:

diff --git a/api/.dockerignore b/api/.dockerignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/api/.gitignore b/api/.gitignore
@@ -3,3 +3,4 @@ node_modules
 .serverless
 config/*.js
 !config/database.js
+build/
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -0,0 +1,10 @@
+FROM node:10
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+RUN npm ci --only=production
+
+COPY build ./build
+
+CMD [ "npm", "start" ]
diff --git a/api/config/database.js b/api/config/database.js
diff --git a/api/config/default.js b/api/config/default.js
diff --git a/api/config/development.js.dist b/api/config/development.js.dist
diff --git a/api/config/production.js.dist b/api/config/production.js.dist
diff --git a/api/makefile b/api/makefile
@@ -11,10 +11,6 @@ install-db:
 	docker run --name comfy-db -p 5432:5432 -d postgres:9.6
 	sleep 5s
 	psql -c "CREATE DATABASE ${DATABASE}"
-	make migrate
-
-migrate:
-	./node_modules/db-migrate/bin/db-migrate up --config ./config/database.js
 
 start-db:
 	docker start comfy-db

diff --git a/api/now.json b/api/now.json
@@ -0,0 +1,11 @@
+{
+    "name": "comfygure-api",
+    "version": 2,
+    "builds": [
+        {
+            "src": "build/index.js",
+            "use": "@now/node"
+        }
+    ],
+    "routes": [{ "src": ".*", "dest": "/build" }]
+}