From 8b61a90b5fa047992b62bb7aecb0d2f73152bd92 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Fri, 10 May 2019 11:46:37 +0200 Subject: [PATCH] fix(core): update --- .gitignore | 3 ++- README.md | 43 +++++++++++++++++++------------------------ package.json | 2 +- ts/tsdocker.cli.ts | 4 +++- ts/tsdocker.config.ts | 4 ++-- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index e713ab4..4ad31d3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ dist_web/ dist_serve/ dist_ts_web/ -# custom \ No newline at end of file +# custom +test/ diff --git a/README.md b/README.md index aac6561..4710955 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,20 @@ -# npmdocker - +# @gitzone/npmdocker develop npm modules cross platform with docker -## Availabililty - -[![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmdocker) -[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmdocker) -[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmdocker) -[![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmdocker/) +## Availabililty and Links +* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/npmdocker) +* [gitlab.com (source)](https://gitlab.com/gitzone/npmdocker) +* [github.com (source mirror)](https://github.com/gitzone/npmdocker) +* [docs (typedoc)](https://gitzone.gitlab.io/npmdocker/) ## Status for master - -[![build status](https://GitLab.com/gitzone/npmdocker/badges/master/build.svg)](https://GitLab.com/gitzone/npmdocker/commits/master) -[![coverage report](https://GitLab.com/gitzone/npmdocker/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmdocker/commits/master) -[![npm downloads per month](https://img.shields.io/npm/dm/npmdocker.svg)](https://www.npmjs.com/package/npmdocker) -[![Dependency Status](https://david-dm.org/gitzonetools/npmdocker.svg)](https://david-dm.org/gitzonetools/npmdocker) -[![bitHound Dependencies](https://www.bithound.io/github/gitzonetools/npmdocker/badges/dependencies.svg)](https://www.bithound.io/github/gitzonetools/npmdocker/master/dependencies/npm) -[![bitHound Code](https://www.bithound.io/github/gitzonetools/npmdocker/badges/code.svg)](https://www.bithound.io/github/gitzonetools/npmdocker) -[![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/gitzone/npmdocker/badges/master/build.svg)](https://gitlab.com/gitzone/npmdocker/commits/master) +[![coverage report](https://gitlab.com/gitzone/npmdocker/badges/master/coverage.svg)](https://gitlab.com/gitzone/npmdocker/commits/master) +[![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/npmdocker.svg)](https://www.npmjs.com/package/@gitzone/npmdocker) +[![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/npmdocker/badge.svg)](https://snyk.io/test/npm/@gitzone/npmdocker) +[![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 @@ -34,10 +29,10 @@ Usually this is the default i CI, but locally behaviour tends to defer. The npmdocker package works in everywhere where the docker cli is available. e.g.: -* docker toolbox -* native docker application -* docker in docker -* mounted docker.sock +- docker toolbox +- native docker application +- docker in docker +- mounted docker.sock ### How do I use it? @@ -62,6 +57,6 @@ create a npmextra.json in the project's root directory 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://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone) +[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com) diff --git a/package.json b/package.json index 792bb6e..1269955 100644 --- a/package.json +++ b/package.json @@ -57,4 +57,4 @@ "@pushrocks/smartstring": "^3.0.10", "@types/shelljs": "^0.8.5" } -} +} \ No newline at end of file diff --git a/ts/tsdocker.cli.ts b/ts/tsdocker.cli.ts index 37b9fa1..2ad7eab 100644 --- a/ts/tsdocker.cli.ts +++ b/ts/tsdocker.cli.ts @@ -78,7 +78,9 @@ export let run = () => { }); logger.log('ok', `Starting vscode in cwd ${paths.cwd}`); await smartshellInstance.execAndWaitForLine( - `docker run -p 127.0.0.1:8443:8443 -v "${paths.cwd}:/home/coder/project" registry.gitlab.com/hosttoday/ht-docker-vscode --allow-http --no-auth`, + `docker run -p 127.0.0.1:8443:8443 -v "${ + paths.cwd + }:/home/coder/project" registry.gitlab.com/hosttoday/ht-docker-vscode --allow-http --no-auth`, /Connected to shared process/ ); await plugins.smartopen.openUrl('testing-vscode.git.zone:8443'); diff --git a/ts/tsdocker.config.ts b/ts/tsdocker.config.ts index 8734055..fdfe5de 100644 --- a/ts/tsdocker.config.ts +++ b/ts/tsdocker.config.ts @@ -10,7 +10,7 @@ export interface IConfig { } const getQenvKeyValueObject = async () => { - let qenvKeyValueObjectArray: {[key: string]: string | number}; + let qenvKeyValueObjectArray: { [key: string]: string | number }; if (plugins.smartfile.fs.fileExistsSync(plugins.path.join(paths.cwd, 'qenv.yml'))) { qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObject; } else { @@ -19,7 +19,7 @@ const getQenvKeyValueObject = async () => { return qenvKeyValueObjectArray; }; -const buildConfig = async (qenvKeyValueObjectArg: {[key: string]: string | number}) => { +const buildConfig = async (qenvKeyValueObjectArg: { [key: string]: string | number }) => { const npmextra = new plugins.npmextra.Npmextra(paths.cwd); const config = npmextra.dataFor('npmdocker', { baseImage: 'hosttoday/ht-docker-node:npmdocker',