Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0d19c1c68d | |||
| cff79bc3b4 | |||
| 28541a838d | |||
| c3ab527341 | |||
| 52cc249098 | |||
| 2e189b0660 | |||
| f876c7414b | |||
| 08b7585cfc | |||
| 76311fab72 | |||
| 1b73df64f5 |
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shipzone/npmci",
|
||||
"version": "3.1.15",
|
||||
"version": "3.1.20",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
@@ -102,7 +102,7 @@
|
||||
},
|
||||
"@pushrocks/projectinfo": {
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/@pushrocks/projectinfo/-/projectinfo-4.0.2.tgz",
|
||||
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fprojectinfo/-/projectinfo-4.0.2.tgz",
|
||||
"integrity": "sha512-u5tSlrJTdDb5r3qmPub5WkDWlW561WfjqylZMkswP4yNZSR2krhew4ra4Y2/6q2QUnMBXRmo1lj4n7ggXoDNWQ==",
|
||||
"requires": {
|
||||
"@pushrocks/smartfile": "^6.0.8",
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "@shipzone/npmci",
|
||||
"version": "3.1.15",
|
||||
"version": "3.1.20",
|
||||
"private": false,
|
||||
"description": "node and docker in gitlab ci on steroids",
|
||||
"main": "dist/index.js",
|
||||
"typings": "dist/index.d.ts",
|
||||
@@ -53,6 +54,5 @@
|
||||
"smartanalytics": "^2.0.9",
|
||||
"smartsocket": "^1.1.19",
|
||||
"through2": "^3.0.0"
|
||||
},
|
||||
"private": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -165,7 +165,7 @@ export let getDockerBuildArgs = async (): Promise<string> => {
|
||||
let buildArgsString: string = '';
|
||||
for (const key in NpmciConfig.configObject.dockerBuildargEnvMap) {
|
||||
const targetValue = process.env[NpmciConfig.configObject.dockerBuildargEnvMap[key]];
|
||||
buildArgsString = `${buildArgsString} --build-arg ${key}=${targetValue}`;
|
||||
buildArgsString = `${buildArgsString} --build-arg ${key}="${targetValue}"`;
|
||||
}
|
||||
return buildArgsString;
|
||||
};
|
||||
|
||||
@@ -3,6 +3,8 @@ import * as plugins from './mod.plugins';
|
||||
import { bash } from '../npmci.bash';
|
||||
import { repo } from '../npmci.env';
|
||||
|
||||
import { configObject } from '../npmci.config';
|
||||
|
||||
/**
|
||||
* handle cli input
|
||||
* @param argvArg
|
||||
@@ -15,10 +17,10 @@ export let handleCli = async argvArg => {
|
||||
await mirror();
|
||||
break;
|
||||
default:
|
||||
logger.log('error', `>>npmci git ...<< action >>${action}<< not supported`);
|
||||
logger.log('error', `npmci git -> action >>${action}<< not supported!`);
|
||||
}
|
||||
} else {
|
||||
logger.log('info', `>>npmci git ...<< cli arguments invalid... Please read the documentation.`);
|
||||
logger.log('info', `npmci git -> cli arguments invalid! Please read the documentation.`);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -26,6 +28,13 @@ export let mirror = async () => {
|
||||
const githubToken = process.env.NPMCI_GIT_GITHUBTOKEN;
|
||||
const githubUser = process.env.NPMCI_GIT_GITHUBGROUP || repo.user;
|
||||
const githubRepo = process.env.NPMCI_GIT_GITHUB || repo.repo;
|
||||
if(
|
||||
configObject.projectInfo.npm.packageJson.private === true ||
|
||||
configObject.npmAccessLevel === 'private'
|
||||
) {
|
||||
logger.log('warn', `refusing to mirror due to private property use a private mirror location instead`);
|
||||
return;
|
||||
}
|
||||
if (githubToken) {
|
||||
logger.log('info', 'found github token.');
|
||||
logger.log('info', 'attempting the mirror the repository to GitHub');
|
||||
|
||||
@@ -6,9 +6,10 @@ import { repo } from './npmci.env';
|
||||
import { KeyValueStore } from '@pushrocks/npmextra';
|
||||
|
||||
export interface INpmciOptions {
|
||||
projectInfo: plugins.projectinfo.ProjectInfo;
|
||||
npmGlobalTools: string[];
|
||||
npmAccessLevel?: 'private' | 'public';
|
||||
npmRegistryUrl?: string;
|
||||
npmRegistryUrl: string;
|
||||
dockerRegistryRepoMap: any;
|
||||
dockerBuildargEnvMap: any;
|
||||
}
|
||||
@@ -19,8 +20,11 @@ export let kvStorage = new KeyValueStore('custom', `${repo.user}_${repo.repo}`);
|
||||
// handle config retrival
|
||||
const npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
|
||||
const defaultConfig: INpmciOptions = {
|
||||
projectInfo: new plugins.projectinfo.ProjectInfo(paths.cwd),
|
||||
npmGlobalTools: [],
|
||||
dockerRegistryRepoMap: {},
|
||||
npmAccessLevel: 'private',
|
||||
npmRegistryUrl: 'registry.npmjs.org',
|
||||
dockerBuildargEnvMap: {}
|
||||
};
|
||||
export let configObject = npmciNpmextra.dataFor<INpmciOptions>('npmci', defaultConfig);
|
||||
|
||||
Reference in New Issue
Block a user