From 713df1867ae15a4184c51111c14613061bb4aa2d Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sat, 24 Nov 2018 15:10:55 +0100 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 12 ------------ package.json | 2 +- ts/mod_docker/mod.classes.dockerfile.ts | 8 ++++++-- ts/mod_docker/mod.helpers.ts | 2 +- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2522e90..8321aed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,18 +37,6 @@ snyk: # ==================== # test stage # ==================== -testLEGACY: - stage: test - script: - - npmci npm prepare - - npmci node install legacy - - npmci npm install - - npmci npm test - coverage: /\d+.?\d+?\%\s*coverage/ - tags: - - docker - - notpriv - allow_failure: true testLTS: stage: test diff --git a/package.json b/package.json index cc51063..40ff38c 100644 --- a/package.json +++ b/package.json @@ -56,4 +56,4 @@ "through2": "^3.0.0" }, "private": false -} +} \ No newline at end of file diff --git a/ts/mod_docker/mod.classes.dockerfile.ts b/ts/mod_docker/mod.classes.dockerfile.ts index 1d47f30..7967252 100644 --- a/ts/mod_docker/mod.classes.dockerfile.ts +++ b/ts/mod_docker/mod.classes.dockerfile.ts @@ -42,7 +42,9 @@ export class Dockerfile { public async build() { logger.log('info', 'now building Dockerfile for ' + this.cleanTag); const buildArgsString = await helpers.getDockerBuildArgs(); - const buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`; + const buildCommand = `docker build -t ${this.buildTag} -f ${ + this.filePath + } ${buildArgsString} .`; await bash(buildCommand); return; } @@ -102,7 +104,9 @@ export class Dockerfile { * gets the id of a Dockerfile */ public async getId() { - const containerId = await bash('docker inspect --type=image --format="{{.Id}}" ' + this.buildTag); + const containerId = await bash( + 'docker inspect --type=image --format="{{.Id}}" ' + this.buildTag + ); return containerId; } } diff --git a/ts/mod_docker/mod.helpers.ts b/ts/mod_docker/mod.helpers.ts index 86b0fcb..2e7dae8 100644 --- a/ts/mod_docker/mod.helpers.ts +++ b/ts/mod_docker/mod.helpers.ts @@ -178,7 +178,7 @@ export let cleanTagsArrayFunction = ( trackingArrayArg: Dockerfile[] ): string[] => { const cleanTagsArray: string[] = []; - dockerfileArrayArg.forEach((dockerfileArg) => { + dockerfileArrayArg.forEach(dockerfileArg => { if (trackingArrayArg.indexOf(dockerfileArg) === -1) { cleanTagsArray.push(dockerfileArg.cleanTag); }