Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b3c47546e2 | |||
| 6316e81958 | |||
| ff10afbee4 | |||
| 9dbfa77084 | |||
| 46dbd61d89 | |||
| 713df1867a |
@@ -37,18 +37,6 @@ snyk:
|
|||||||
# ====================
|
# ====================
|
||||||
# test stage
|
# 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:
|
testLTS:
|
||||||
stage: test
|
stage: test
|
||||||
|
|||||||
@@ -5,9 +5,7 @@
|
|||||||
"cli": true
|
"cli": true
|
||||||
},
|
},
|
||||||
"npmci": {
|
"npmci": {
|
||||||
"npmGlobalTools": [
|
"npmGlobalTools": [],
|
||||||
"@gitzone/npmts"
|
|
||||||
],
|
|
||||||
"npmAccessLevel": "public"
|
"npmAccessLevel": "public"
|
||||||
},
|
},
|
||||||
"npmdocker":{
|
"npmdocker":{
|
||||||
|
|||||||
8
package-lock.json
generated
8
package-lock.json
generated
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@shipzone/npmci",
|
"name": "@shipzone/npmci",
|
||||||
"version": "3.1.1",
|
"version": "3.1.4",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -252,9 +252,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@pushrocks/smartshell": {
|
"@pushrocks/smartshell": {
|
||||||
"version": "2.0.8",
|
"version": "2.0.11",
|
||||||
"resolved": "https://registry.npmjs.org/@pushrocks/smartshell/-/smartshell-2.0.8.tgz",
|
"resolved": "https://registry.npmjs.org/@pushrocks/smartshell/-/smartshell-2.0.11.tgz",
|
||||||
"integrity": "sha512-OeGrJez0vSHe/E0auHNUqf7r0B3yS+pkVe6BuxdJemJx5LBRtcHuZnJCxU5pSLL8igzlTfR+jVpjKJXUMzCsrA==",
|
"integrity": "sha512-NvDrafAgSPK12/HAekyL+BF5lROxhcfBNJIELI/bU7Jto/32QOOn6DthzMEPbqyPzsH7mWMjv10Djy3TWdqZag==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@pushrocks/smartpromise": "^2.0.5",
|
"@pushrocks/smartpromise": "^2.0.5",
|
||||||
"@types/which": "^1.3.1",
|
"@types/which": "^1.3.1",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@shipzone/npmci",
|
"name": "@shipzone/npmci",
|
||||||
"version": "3.1.1",
|
"version": "3.1.4",
|
||||||
"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",
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
"@pushrocks/smartparam": "^1.0.4",
|
"@pushrocks/smartparam": "^1.0.4",
|
||||||
"@pushrocks/smartpromise": "^2.0.5",
|
"@pushrocks/smartpromise": "^2.0.5",
|
||||||
"@pushrocks/smartrequest": "^1.1.14",
|
"@pushrocks/smartrequest": "^1.1.14",
|
||||||
"@pushrocks/smartshell": "^2.0.8",
|
"@pushrocks/smartshell": "^2.0.11",
|
||||||
"@pushrocks/smartssh": "^1.2.3",
|
"@pushrocks/smartssh": "^1.2.3",
|
||||||
"@pushrocks/smartstring": "^3.0.4",
|
"@pushrocks/smartstring": "^3.0.4",
|
||||||
"@types/lodash": "^4.14.118",
|
"@types/lodash": "^4.14.118",
|
||||||
|
|||||||
@@ -42,7 +42,9 @@ export class Dockerfile {
|
|||||||
public async build() {
|
public async build() {
|
||||||
logger.log('info', 'now building Dockerfile for ' + this.cleanTag);
|
logger.log('info', 'now building Dockerfile for ' + this.cleanTag);
|
||||||
const buildArgsString = await helpers.getDockerBuildArgs();
|
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);
|
await bash(buildCommand);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -102,7 +104,9 @@ export class Dockerfile {
|
|||||||
* gets the id of a Dockerfile
|
* gets the id of a Dockerfile
|
||||||
*/
|
*/
|
||||||
public async getId() {
|
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;
|
return containerId;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ export let cleanTagsArrayFunction = (
|
|||||||
trackingArrayArg: Dockerfile[]
|
trackingArrayArg: Dockerfile[]
|
||||||
): string[] => {
|
): string[] => {
|
||||||
const cleanTagsArray: string[] = [];
|
const cleanTagsArray: string[] = [];
|
||||||
dockerfileArrayArg.forEach((dockerfileArg) => {
|
dockerfileArrayArg.forEach(dockerfileArg => {
|
||||||
if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
|
if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
|
||||||
cleanTagsArray.push(dockerfileArg.cleanTag);
|
cleanTagsArray.push(dockerfileArg.cleanTag);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user