From 81feeb6cbb6dcc9823b19157d8683241d9ae725d Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Tue, 5 Nov 2019 15:33:09 +0100 Subject: [PATCH] fix(core): update --- .gitignore | 8 +++-- .gitlab-ci.yml | 94 +++++++++++++++++++++++--------------------------- npmextra.json | 13 +++++++ package.json | 15 ++++++-- readme.md | 12 +++++-- 5 files changed, 84 insertions(+), 58 deletions(-) create mode 100644 npmextra.json diff --git a/.gitignore b/.gitignore index d1c7ba6..91c0db0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,13 +8,15 @@ pages/ # installs node_modules/ -# caches and builds +# caches .yarn/ .cache/ +.rpt2_cache + +# builds dist/ dist_web/ dist_serve/ dist_ts_web/ -# custom -code-server/ +# custom \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 539dfb0..180ab89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,77 +1,69 @@ -# gitzone docker -image: hosttoday/ht-docker-dbase:npmci -services: - - docker:dind +# gitzone ci_docker +image: registry.gitlab.com/hosttoday/ht-docker-node:npmci -stages: - - buildAndTest - - triggerPagesVerify +cache: + paths: + - .npmci-cache/ + key: '$CI_BUILD_STAGE' before_script: - - npm install -g @shipzone/npmci - - npmci docker login + - npmci npm prepare -buildTest: - stage: buildAndTest +stages: + - test + - release + - trigger + - pages + +testStable: + stage: test script: - - npmci docker build - - npmci docker test - except: - - tags - - triggers + - npmci npm prepare + - npmci node install stable + - npmci npm install + - npmci npm test + coverage: /\d+.?\d+?\%\s*coverage/ tags: - lossless - - priv + - docker -buildTestRelease: - stage: buildAndTest +testBuild: + stage: test script: + - npmci npm prepare + - npmci node install stable + - npmci npm install + - npmci command npm run build + coverage: /\d+.?\d+?\%\s*coverage/ + tags: + - lossless + - docker + - notpriv + +release: + image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci + services: + - docker:stable-dind + stage: release + script: + - npmci node install stable + - npmci docker login - npmci docker build - npmci docker test - - npmci docker push registry.gitlab.com test - npmci docker push registry.gitlab.com - - npmci docker push docker.io only: - tags - - triggers tags: - lossless + - docker - priv trigger: - stage: triggerPagesVerify + stage: trigger script: - npmci trigger only: - tags - - triggers tags: - lossless - - priv - -pages: - stage: triggerPagesVerify - before_script: - - 'npmci -v' - image: hosttoday/ht-docker-node:npmci - script: - # - npmci command npm install -g npmpage - # - npmci command npmpage - - echo "nothing here yet until @gitzone/npmpage is ready!" - only: - - tags - tags: - docker - artifacts: - expire_in: 1 week - paths: - - public - -verify: - stage: triggerPagesVerify - script: - - npmci docker pull registry.gitlab.com test - only: - - tags - tags: - - docker \ No newline at end of file diff --git a/npmextra.json b/npmextra.json new file mode 100644 index 0000000..a7a33fc --- /dev/null +++ b/npmextra.json @@ -0,0 +1,13 @@ +{ + "gitzone": { + "module": { + "githost": "gitlab.com", + "gitscope": "hosttoday", + "gitrepo": "ht-docker-vscode", + "shortDescription": "a vscode image with everything installed needed to run a vscode instance", + "npmPackagename": "@hosttoday/ht-docker-vscode", + "license": "MIT" + } + }, + "npmci": {} +} \ No newline at end of file diff --git a/package.json b/package.json index d02bd5d..e4cbc39 100644 --- a/package.json +++ b/package.json @@ -17,5 +17,16 @@ "url": "https://github.com/HostToday/ht-docker-vscode/issues" }, "homepage": "https://github.com/HostToday/ht-docker-vscode#readme", - "private": true -} + "private": true, + "files": [ + "ts/**/*", + "ts_web/**/*", + "dist/**/*", + "dist_web/**/*", + "dist_ts_web/**/*", + "assets/**/*", + "cli.js", + "npmextra.json", + "readme.md" + ] +} \ No newline at end of file diff --git a/readme.md b/readme.md index 1b084b1..68a3adb 100644 --- a/readme.md +++ b/readme.md @@ -18,9 +18,17 @@ a vscode image with everything installed needed to run a vscode instance ## Usage +``` +docker run -it -p 127.0.0.1:8080:8080 -v "${HOME}/.local/share/code-server:/home/coder/.local/share/code-server" -v "$PWD:/home/coder/project" hosttoday/ht-docker-vscode +``` + +## Contribution + +We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :) + 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) -[![repo-footer](https://hosttoday.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com) +[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)