From e30cc3f5a07782d3f2c222d35277cae3502b7bd5 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sun, 24 Feb 2019 22:50:12 +0100 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 5 ++++- npmextra.json | 36 +++++++++++++++++++++++------------- package.json | 2 +- readme.md | 37 ++++++++++++++++--------------------- 4 files changed, 44 insertions(+), 36 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 697570f..0dfb491 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,13 +36,16 @@ snyk: sast: stage: security - image: docker:stable + image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci variables: DOCKER_DRIVER: overlay2 allow_failure: true services: - docker:stable-dind script: + - npmci npm prepare + - npmci npm install + - npmci command npm run build - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - docker run --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}" diff --git a/npmextra.json b/npmextra.json index e4c43ce..7b1f1d6 100644 --- a/npmextra.json +++ b/npmextra.json @@ -1,16 +1,26 @@ { - "npmts":{ - "mode":"default", - "coverageTreshold": "70", - "cli": true - }, - "npmci": { - "npmGlobalTools": [], - "npmAccessLevel": "public", - "npmRegistryUrl": "registry.npmjs.org" - }, - "npmdocker":{ - "baseImage":"hosttoday/ht-docker-node:npmci", - "command": "npmci test stable" + "npmts": { + "mode": "default", + "coverageTreshold": "70", + "cli": true + }, + "npmci": { + "npmGlobalTools": [], + "npmAccessLevel": "public", + "npmRegistryUrl": "registry.npmjs.org" + }, + "npmdocker": { + "baseImage": "hosttoday/ht-docker-node:npmci", + "command": "npmci test stable" + }, + "gitzone": { + "module": { + "githost": "gitlab.com", + "gitscope": "shipzone", + "gitrepo": "npmci", + "shortDescription": "node and docker in gitlab ci on steroids", + "npmPackagename": "@shipzone/npmci", + "license": "MIT" } + } } \ No newline at end of file diff --git a/package.json b/package.json index 22e52c9..baee8f0 100644 --- a/package.json +++ b/package.json @@ -55,4 +55,4 @@ "smartsocket": "^1.1.19", "through2": "^3.0.0" } -} +} \ No newline at end of file diff --git a/readme.md b/readme.md index 7296a5e..c998e35 100644 --- a/readme.md +++ b/readme.md @@ -1,25 +1,20 @@ -# npmci - +# @shipzone/npmci node and docker in gitlab ci on steroids -## Availabililty - -[![npm](https://shipzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/@shipzone/npmci) -[![git](https://shipzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/shipzone/npmci) -[![git](https://shipzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/shipzone/npmci) -[![docs](https://shipzone.gitlab.io/assets/repo-button-docs.svg)](https://shipzone.gitlab.io/npmci/) +## Availabililty and Links +* [npmjs.org (npm package)](https://www.npmjs.com/package/@shipzone/npmci) +* [gitlab.com (source)](https://gitlab.com/shipzone/npmci) +* [github.com (source mirror)](https://github.com/shipzone/npmci) +* [docs (typedoc)](https://shipzone.gitlab.io/npmci/) ## Status for master - -[![build status](https://GitLab.com/shipzone/npmci/badges/master/build.svg)](https://GitLab.com/shipzone/npmci/commits/master) -[![coverage report](https://GitLab.com/shipzone/npmci/badges/master/coverage.svg)](https://GitLab.com/shipzone/npmci/commits/master) -[![npm downloads per month](https://img.shields.io/npm/dm/npmci.svg)](https://www.npmjs.com/package/@shipzone/npmci) -[![Dependency Status](https://david-dm.org/shipzone/npmci.svg)](https://david-dm.org/shipzone/npmci) -[![bitHound Dependencies](https://www.bithound.io/github/shipzone/npmci/badges/dependencies.svg)](https://www.bithound.io/github/shipzone/npmci/master/dependencies/npm) -[![bitHound Code](https://www.bithound.io/github/shipzone/npmci/badges/code.svg)](https://www.bithound.io/github/shipzone/npmci) -[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/) -[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/) -[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) +[![build status](https://gitlab.com/shipzone/npmci/badges/master/build.svg)](https://gitlab.com/shipzone/npmci/commits/master) +[![coverage report](https://gitlab.com/shipzone/npmci/badges/master/coverage.svg)](https://gitlab.com/shipzone/npmci/commits/master) +[![npm downloads per month](https://img.shields.io/npm/dm/@shipzone/npmci.svg)](https://www.npmjs.com/package/@shipzone/npmci) +[![Known Vulnerabilities](https://snyk.io/test/npm/@shipzone/npmci/badge.svg)](https://snyk.io/test/npm/@shipzone/npmci) +[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) +[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) +[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/) ## Usage @@ -98,9 +93,9 @@ For further information read the linked docs at the top of this README. Use TypeScript for best in class instellisense. -For further information read the linked docs at the top of this README. +For further information read the linked docs at the top of this readme. > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) -> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html) +| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html) -[![repo-footer](https://shipzone.gitlab.io/assets/repo-footer.svg)](https://push.rocks) +[![repo-footer](https://shipzone.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)