@devcontainer/generator - npm Package Compare versions

Comparing version 1.7.0 to 1.7.1

lib/src/devcontainerGenerator.d.ts

@@ -18,3 +18,4 @@ declare type Base = "stretch" | "buster" | "disco" | "eoan";
     private _docker;
-    private _remoteDesktop;
+    private _xpra;
+    private _noVNC;
     private _zsh;
@@ -29,3 +30,3 @@ private _chrome;
     setAmplify(): void;
-    setRemoteDesktop(): void;
+    setRemoteDesktop(type?: 'xpra' | 'noVNC'): void;
     setUpgraded(): void;
@@ -32,0 +33,0 @@ setZsh(): void;

lib/src/devcontainerGenerator.js

@@ -16,3 +16,3 @@ "use strict";
         this._readmeTemplates = {};
-        this._templateInputs = ['base', 'upgrade', 'git', 'amplify', 'chromium', 'gitUbuntu', 'node', 'cypress', 'dotnet', 'docker', 'dotnet3', 'xfce', 'remoteDesktop', 'zsh'];
+        this._templateInputs = ['base', 'upgrade', 'git', 'amplify', 'chromium', 'gitUbuntu', 'node', 'cypress', 'dotnet', 'docker', 'dotnet3', 'xfce', 'noVNC', 'xpra', 'zsh', 'suffix'];
         this._nodeVesion = null;
@@ -26,3 +26,4 @@ this._gitVersion = '';
         this._docker = false;
-        this._remoteDesktop = false;
+        this._xpra = false;
+        this._noVNC = false;
         this._zsh = false;
@@ -58,4 +59,11 @@ this._chrome = false;
     }
-    setRemoteDesktop() {
-        this._remoteDesktop = true;
+    setRemoteDesktop(type = 'xpra') {
+        if (type === 'xpra') {
+            this._xpra = true;
+        }
+        else {
+            this._noVNC = true;
+        }
+        if (this._noVNC === true && this._xpra === true)
+            throw new Error("You can't have VNC and Xpra on the same image");
     }
@@ -126,5 +134,5 @@ setUpgraded() {
         }
-        if (this._remoteDesktop) {
-            this._dockerfile += dockerTemplates['remoteDesktop'].replace(/{XPRADISTRO}/g, this.base === "eoan" ? "disco" : this.base);
-            this._readme += readmeTemplates['remoteDesktop'];
+        if (this._xpra) {
+            this._dockerfile += dockerTemplates['xpra'].replace(/{XPRADISTRO}/g, this.base === "eoan" ? "disco" : this.base);
+            this._readme += readmeTemplates['xpra'];
         }
@@ -134,2 +142,7 @@ if (this._xfce) {
             this._readme += readmeTemplates['xfce'];
+            if (this._xpra) {
+                this._dockerfile += `
+                ENV STARTCMD="xpra start-desktop --start=xfce4-session --html=on --bind-tcp=0.0.0.0:6080 --daemon=no"
+                `;
+            }
         }
@@ -148,2 +161,6 @@ if (this._amplify) {
         }
+        if (this._noVNC) {
+            this._dockerfile += dockerTemplates['noVNC'];
+            this._readme += readmeTemplates['noVNC'];
+        }
         if (this._zsh) {
@@ -153,2 +170,4 @@ this._dockerfile += dockerTemplates['zsh'];
         }
+        this._dockerfile += dockerTemplates['suffix'];
+        this._readme += readmeTemplates['suffix'];
         this._dockerfile = this._dockerfile.replace(/FROM devimage\n/g, "");
@@ -155,0 +174,0 @@ return {

package.json

 {
   "name": "@devcontainer/generator",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "generates custorm devcontainer Dockerfiles",
@@ -23,3 +23,3 @@ "files": [
   "license": "MIT",
-  "gitHead": "7e798a95a546b90143ae77afbd99f952c5030eb9"
+  "gitHead": "3ff51f097d2eb81f0e35cc1936dde44b97db9a2f"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

32233

increased by9.86%

Number of downloads

6

increased by20%

Number of package files

41

increased by10.81%

Lines of code

255

increased by8.51%

No dependency changes