5.0.21

.gitignore

@@ -8,9 +8,12 @@ pages/
 # installs
 node_modules/
 
-# caches and builds
+# caches
 .yarn/
 .cache/
+.rpt2_cache
+
+# builds
 dist/
 dist_web/
 dist_serve/

.gitlab-ci.yml

@@ -1,77 +1,69 @@
-# gitzone docker
+# gitzone ci_docker
-image: hosttoday/ht-docker-dbase:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-services:
-  - docker:dind
 
-stages:
+cache:
-  - buildAndTest
+  paths:
-  - triggerPagesVerify
+    - .npmci-cache/
+  key: '$CI_BUILD_STAGE'
 
 before_script:
-  - npm install -g @shipzone/npmci
+  - npmci npm prepare
-  - npmci docker login
 
-buildTest:
+stages:
-  stage: buildAndTest
+  - test
+  - release
+  - trigger
+  - pages
+
+testStable:
+  stage: test
   script:
-    - npmci docker build
+    - npmci npm prepare
-    - npmci docker test
+    - npmci node install stable
-  except:
+    - npmci npm install
-    - tags
+    - npmci npm test
-    - triggers
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - lossless
-    - priv
+    - docker
 
-buildTestRelease:
+testBuild:
-  stage: buildAndTest
+  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

Dockerfile

@@ -1,12 +1,13 @@
-FROM codercom/code-server
+FROM codercom/code-server:v2
 LABEL author="Lossless GmbH <hello@lossless.com>"
 
-WORKDIR /workspace
+USER root
+
 # important environment variables 
 ENV NODE_VERSION_LTS="10.15.3" NODE_VERSION_STABLE="11.2.0" NVM_DIR="/usr/local/nvm"
 
 # Set debconf to run non-interactively and install packages
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
+RUN su -c "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
     && apt-get update \
     && apt-get upgrade --no-install-recommends -y \
     && apt-get install -y -q --no-install-recommends \
@@ -26,13 +27,17 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
         wget \
     && apt-get update \
     && apt-get clean \
-    && rm -r /var/lib/apt/lists/*
+    && rm -r /var/lib/apt/lists/*"
+
+RUN mkdir $NVM_DIR && sudo chown coder $NVM_DIR && chmod u+w $NVM_DIR
+
+USER coder
 
 # Install nvm with node and npm
 RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
 RUN bash -c "source $NVM_DIR/nvm.sh \
     && nvm install $NODE_VERSION_LTS \
-    && nvm alias default $NODE_VERSION_STABLE \
+    && nvm alias default $NODE_VERSION_LTS \
     && nvm use default \
     && npm config set unsafe-perm true \
     && npm install -g npm"

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": {}
+}

package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "ht-docker-vscode",
+  "version": "5.0.21",
+  "lockfileVersion": 1
+}

package.json

@@ -1,10 +1,10 @@
 {
   "name": "ht-docker-vscode",
-  "version": "5.0.10",
+  "version": "5.0.21",
   "description": "a vscode image with everything installed needed to run a vscode instance",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "echo \"Error: no test specified\"",
     "build": "echo \"Not needed for now\""
   },
   "repository": {
@@ -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"
+  ]
 }

readme.md

@@ -18,9 +18,19 @@ a vscode image with everything installed needed to run a vscode instance
 
 ## Usage
 
+This image uses codercom/code-server:v2 as base. As a result you can use it largely like the base image.
+
+```
+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" registry.gitlab.com/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)