Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 59d8338f6e | |||
| a4f8bd3320 | |||
| 7c2fdb7224 | |||
| 37384aeb57 | |||
| 60efda263f | |||
| 19831037ec |
@@ -1,5 +1,5 @@
|
|||||||
# gitzone ci_default
|
# gitzone ci_default
|
||||||
image: hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
@@ -50,22 +50,10 @@ testLTS:
|
|||||||
- docker
|
- docker
|
||||||
- notpriv
|
- notpriv
|
||||||
|
|
||||||
testSTABLE:
|
|
||||||
stage: test
|
|
||||||
script:
|
|
||||||
- npmci npm prepare
|
|
||||||
- npmci node install stable
|
|
||||||
- npmci npm install
|
|
||||||
- npmci npm test
|
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
|
||||||
tags:
|
|
||||||
- docker
|
|
||||||
- notpriv
|
|
||||||
|
|
||||||
release:
|
release:
|
||||||
stage: release
|
stage: release
|
||||||
script:
|
script:
|
||||||
- npmci node install stable
|
- npmci node install lts
|
||||||
- npmci npm publish
|
- npmci npm publish
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
|
|||||||
2
package-lock.json
generated
2
package-lock.json
generated
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@shipzone/npmci",
|
"name": "@shipzone/npmci",
|
||||||
"version": "3.1.30",
|
"version": "3.1.33",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@shipzone/npmci",
|
"name": "@shipzone/npmci",
|
||||||
"version": "3.1.30",
|
"version": "3.1.33",
|
||||||
"private": false,
|
"private": false,
|
||||||
"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",
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export let modArgvArg; // will be set through the build command
|
|||||||
* handle cli input
|
* handle cli input
|
||||||
* @param argvArg
|
* @param argvArg
|
||||||
*/
|
*/
|
||||||
export let handleCli = async argvArg => {
|
export const handleCli = async argvArg => {
|
||||||
modArgvArg = argvArg;
|
modArgvArg = argvArg;
|
||||||
if (argvArg._.length >= 2) {
|
if (argvArg._.length >= 2) {
|
||||||
const action: string = argvArg._[1];
|
const action: string = argvArg._[1];
|
||||||
@@ -59,7 +59,7 @@ export let handleCli = async argvArg => {
|
|||||||
/**
|
/**
|
||||||
* builds a cwd of Dockerfiles by triggering a promisechain
|
* builds a cwd of Dockerfiles by triggering a promisechain
|
||||||
*/
|
*/
|
||||||
export let build = async () => {
|
export const build = async () => {
|
||||||
await prepare();
|
await prepare();
|
||||||
logger.log('info', 'now building Dockerfiles...');
|
logger.log('info', 'now building Dockerfiles...');
|
||||||
await helpers
|
await helpers
|
||||||
@@ -72,7 +72,7 @@ export let build = async () => {
|
|||||||
/**
|
/**
|
||||||
* login to the DockerRegistries
|
* login to the DockerRegistries
|
||||||
*/
|
*/
|
||||||
export let login = async () => {
|
export const login = async () => {
|
||||||
await prepare();
|
await prepare();
|
||||||
await npmciRegistryStorage.loginAll();
|
await npmciRegistryStorage.loginAll();
|
||||||
};
|
};
|
||||||
@@ -80,7 +80,7 @@ export let login = async () => {
|
|||||||
/**
|
/**
|
||||||
* logs in docker
|
* logs in docker
|
||||||
*/
|
*/
|
||||||
export let prepare = async () => {
|
export const prepare = async () => {
|
||||||
// Always login to GitLab Registry
|
// Always login to GitLab Registry
|
||||||
if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') {
|
if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') {
|
||||||
logger.log('error', 'No registry token specified by gitlab!');
|
logger.log('error', 'No registry token specified by gitlab!');
|
||||||
@@ -112,7 +112,13 @@ export const push = async argvArg => {
|
|||||||
// lets parse the input of cli and npmextra
|
// lets parse the input of cli and npmextra
|
||||||
if (argvArg._.length >= 3 && argvArg._[2] !== 'npmextra') {
|
if (argvArg._.length >= 3 && argvArg._[2] !== 'npmextra') {
|
||||||
dockerRegistryUrls.push(argvArg._[2]);
|
dockerRegistryUrls.push(argvArg._[2]);
|
||||||
} else if (configObject.dockerRegistries) {
|
} else {
|
||||||
|
if (configObject.dockerRegistries.length === 0) {
|
||||||
|
logger.log(
|
||||||
|
'warn',
|
||||||
|
`There are no docker registries listed in npmextra.json! This is strange!`
|
||||||
|
);
|
||||||
|
}
|
||||||
dockerRegistryUrls = dockerRegistryUrls.concat(configObject.dockerRegistries);
|
dockerRegistryUrls = dockerRegistryUrls.concat(configObject.dockerRegistries);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,7 +148,7 @@ export const push = async argvArg => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export let pull = async argvArg => {
|
export const pull = async argvArg => {
|
||||||
await prepare();
|
await prepare();
|
||||||
const registryUrlArg = argvArg._[2];
|
const registryUrlArg = argvArg._[2];
|
||||||
let suffix = null;
|
let suffix = null;
|
||||||
@@ -159,7 +165,10 @@ export let pull = async argvArg => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export let test = async () => {
|
/**
|
||||||
|
* tests docker files
|
||||||
|
*/
|
||||||
|
export const test = async () => {
|
||||||
await prepare();
|
await prepare();
|
||||||
return await helpers.readDockerfiles().then(helpers.testDockerfiles);
|
return await helpers.readDockerfiles().then(helpers.testDockerfiles);
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user