Compare commits

...

2 Commits

Author SHA1 Message Date
c8c17e6cba 3.0.24 2017-10-11 18:15:25 +02:00
23dfefd813 update syntax 2017-10-11 18:15:22 +02:00
3 changed files with 7 additions and 7 deletions

View File

@@ -74,9 +74,9 @@ class Dockerfile {
yield npmci_bash_1.bash(`docker run --name npmci_test_container --entrypoint="bash" ${this.buildTag} -c "mkdir /npmci_test"`); yield npmci_bash_1.bash(`docker run --name npmci_test_container --entrypoint="bash" ${this.buildTag} -c "mkdir /npmci_test"`);
yield npmci_bash_1.bash(`docker cp ${testFile} npmci_test_container:/npmci_test/test.sh`); yield npmci_bash_1.bash(`docker cp ${testFile} npmci_test_container:/npmci_test/test.sh`);
yield npmci_bash_1.bash(`docker commit npmci_test_container npmci_test_image`); yield npmci_bash_1.bash(`docker commit npmci_test_container npmci_test_image`);
yield npmci_bash_1.bash('docker run --entrypoint="bash" npmci_test_image -x /npmci_test/test.sh'); yield npmci_bash_1.bash(`docker run --entrypoint="bash" npmci_test_image -x /npmci_test/test.sh`);
yield npmci_bash_1.bash('docker rm npmci_test_container'); yield npmci_bash_1.bash(`docker rm npmci_test_container`);
yield npmci_bash_1.bash('docker rmi --force npmci_test_image'); yield npmci_bash_1.bash(`docker rmi --force npmci_test_image`);
} }
else { else {
plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!'); plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!');

View File

@@ -1,6 +1,6 @@
{ {
"name": "npmci", "name": "npmci",
"version": "3.0.23", "version": "3.0.24",
"description": "node and docker in gitlab ci on steroids", "description": "node and docker in gitlab ci on steroids",
"main": "dist/index.js", "main": "dist/index.js",
"typings": "dist/index.d.ts", "typings": "dist/index.d.ts",

View File

@@ -75,9 +75,9 @@ export class Dockerfile {
await bash(`docker run --name npmci_test_container --entrypoint="bash" ${this.buildTag} -c "mkdir /npmci_test"`) await bash(`docker run --name npmci_test_container --entrypoint="bash" ${this.buildTag} -c "mkdir /npmci_test"`)
await bash(`docker cp ${testFile} npmci_test_container:/npmci_test/test.sh`) await bash(`docker cp ${testFile} npmci_test_container:/npmci_test/test.sh`)
await bash(`docker commit npmci_test_container npmci_test_image`) await bash(`docker commit npmci_test_container npmci_test_image`)
await bash('docker run --entrypoint="bash" npmci_test_image -x /npmci_test/test.sh') await bash(`docker run --entrypoint="bash" npmci_test_image -x /npmci_test/test.sh`)
await bash('docker rm npmci_test_container') await bash(`docker rm npmci_test_container`)
await bash('docker rmi --force npmci_test_image') await bash(`docker rmi --force npmci_test_image`)
} else { } else {
plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!') plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
} }