prepare for in docker test trough npmts

This commit is contained in:
Philipp Kunz 2016-06-16 02:41:17 +02:00
parent 38dca0c9a0
commit c58dad05cd
5 changed files with 7 additions and 9 deletions

View File

@ -47,7 +47,7 @@ trigger:
script: script:
- npmci trigger - npmci trigger
only: only:
- master - tags
tags: tags:
- lossless - lossless
- priv - priv

View File

@ -1,3 +1,4 @@
FROM hosttoday/ht-docker-node:lts FROM hosttoday/ht-docker-node:lts
COPY ./node_modules /app-node/node_modules COPY ./node_modules /app-node/node_modules
COPY ./dist /app-node/dist COPY ./dist /app-node/dist
CMD ["npmts"]

View File

@ -10,8 +10,8 @@ nginx2:
VIRTUAL_HOST: "test101.labkomp.de" VIRTUAL_HOST: "test101.labkomp.de"
restart: always restart: always
container_name: nginx2 container_name: nginx2
dockersock: npmts-test-container:
image: "trafficimg" image: "npmts-test-image"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@ -19,4 +19,4 @@ dockersock:
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
env_file: "nogit/nogit.env" env_file: "nogit/nogit.env"
restart: always restart: always
container_name: dockersock-container container_name: npmts-test-container

View File

@ -4,8 +4,7 @@
"description": "easy communication with docker from node, TypeScript ready", "description": "easy communication with docker from node, TypeScript ready",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
"test": "npmts", "test": "npmts testindocker"
"testindocker": "bash -x ./test/testEnv.sh"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -1,4 +1,2 @@
npmts
docker-machine start default; eval \"$(docker-machine env default)\"
docker build -t dockersock-image . docker build -t dockersock-image .
docker-compose up docker-compose up