From c58dad05cd79c77f35444672e33cacae78f9dd20 Mon Sep 17 00:00:00 2001
From: Phil Kunz <github@philkunz.com>
Date: Thu, 16 Jun 2016 02:41:17 +0200
Subject: [PATCH] prepare for in docker test trough npmts

---
 .gitlab-ci.yml     | 2 +-
 Dockerfile         | 3 ++-
 docker-compose.yml | 6 +++---
 package.json       | 3 +--
 test/testEnv.sh    | 2 --
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 181416c..c2fd8d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ trigger:
   script:
     - npmci trigger
   only:
-    - master
+    - tags
   tags:
     - lossless
     - priv
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 76425ba..70ce6dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,4 @@
 FROM hosttoday/ht-docker-node:lts
 COPY ./node_modules /app-node/node_modules
-COPY ./dist /app-node/dist 
\ No newline at end of file
+COPY ./dist /app-node/dist
+CMD ["npmts"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 0667aa6..ab3eb8d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,8 +10,8 @@ nginx2:
     VIRTUAL_HOST: "test101.labkomp.de"
   restart: always
   container_name: nginx2
-dockersock:
-  image: "trafficimg"
+npmts-test-container:
+  image: "npmts-test-image"
   ports:
     - "80:80"
     - "443:443"
@@ -19,4 +19,4 @@ dockersock:
     - "/var/run/docker.sock:/var/run/docker.sock"
   env_file: "nogit/nogit.env"
   restart: always
-  container_name: dockersock-container
\ No newline at end of file
+  container_name: npmts-test-container
\ No newline at end of file
diff --git a/package.json b/package.json
index a52f9cd..f156647 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,7 @@
   "description": "easy communication with docker from node, TypeScript ready",
   "main": "dist/index.js",
   "scripts": {
-    "test": "npmts",
-    "testindocker": "bash -x ./test/testEnv.sh"
+    "test": "npmts testindocker"
   },
   "repository": {
     "type": "git",
diff --git a/test/testEnv.sh b/test/testEnv.sh
index f35da9b..7240624 100644
--- a/test/testEnv.sh
+++ b/test/testEnv.sh
@@ -1,4 +1,2 @@
-npmts
-docker-machine start default; eval \"$(docker-machine env default)\"
 docker build -t dockersock-image .
 docker-compose up
\ No newline at end of file