Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 46dbd61d89 | |||
| 713df1867a | |||
| 23886c1ed3 | |||
| 0c46b627be |
@@ -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
|
||||
|
||||
28
.snyk
28
.snyk
@@ -1,28 +1,4 @@
|
||||
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
|
||||
version: v1.12.0
|
||||
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
|
||||
ignore:
|
||||
'npm:shelljs:20140723':
|
||||
- shelljs:
|
||||
reason: None given
|
||||
expires: '2018-06-02T22:48:10.660Z'
|
||||
- smartshell > shelljs:
|
||||
reason: None given
|
||||
expires: '2018-06-02T22:48:10.660Z'
|
||||
- smartssh > shelljs:
|
||||
reason: None given
|
||||
expires: '2018-06-02T22:48:10.660Z'
|
||||
- smartshell > shelljs:
|
||||
reason: None given
|
||||
expires: '2018-08-14T21:49:25.248Z'
|
||||
- smartssh > shelljs:
|
||||
reason: None given
|
||||
expires: '2018-08-14T21:49:25.248Z'
|
||||
- shelljs:
|
||||
reason: None given
|
||||
expires: '2018-08-14T21:49:25.248Z'
|
||||
'npm:stringstream:20180511':
|
||||
- request > stringstream:
|
||||
reason: None given
|
||||
expires: '2018-08-14T21:49:25.248Z'
|
||||
version: v1.13.1
|
||||
ignore: {}
|
||||
patch: {}
|
||||
|
||||
2
package-lock.json
generated
2
package-lock.json
generated
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shipzone/npmci",
|
||||
"version": "3.1.0",
|
||||
"version": "3.1.2",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shipzone/npmci",
|
||||
"version": "3.1.0",
|
||||
"version": "3.1.2",
|
||||
"description": "node and docker in gitlab ci on steroids",
|
||||
"main": "dist/index.js",
|
||||
"typings": "dist/index.d.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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user