From 37028a9b1ffe9721bf33aa9b25483bee5c8a04b4 Mon Sep 17 00:00:00 2001
From: PhilKunz <github@philkunz.com>
Date: Thu, 28 Jul 2016 19:38:26 +0200
Subject: [PATCH] add npmdocker

---
 .gitlab-ci.yml | 2 +-
 Dockerfile     | 6 ------
 npmextra.json  | 5 +++++
 package.json   | 5 +----
 4 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c2fd8d8..a9027b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: hosttoday/ht-docker-dbase
+image: hosttoday/ht-docker-dbase:npmts
 services:
   - docker:dind
 
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 0513f4f..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM hosttoday/ht-docker-node:npmts
-RUN mkdir app-node
-COPY ./ /app-node/
-WORKDIR /app-node
-ENV CI true
-CMD ["npmts"]
\ No newline at end of file
diff --git a/npmextra.json b/npmextra.json
index b66b2ea..7b16fdd 100644
--- a/npmextra.json
+++ b/npmextra.json
@@ -2,5 +2,10 @@
     "npmts":{
         "mode":"default",
         "coverageTreshold":10
+    },
+    "npmdocker":{
+        "baseImage":"hosttoday/ht-docker-node:npmts",
+        "command":"npmts",
+        "dockerSock":"true"
     }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index fd76390..8b7f2e4 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,7 @@
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "npmts --notest && npm run build && npm run startdocker && npm run cleanup",
-    "build": "docker build -t npmts-test-image .",
-    "startdocker": "docker run -v /var/run/docker.sock:/var/run/docker.sock --name npmts-test-container npmts-test-image",
-    "cleanup": "docker rm npmts-test-container && docker rmi npmts-test-image"
+    "test": "npmdocker"
   },
   "repository": {
     "type": "git",