Merge pull request #309 from MicrosoftDX/dev

Dev to Master for 0.2

Author: etiennemargraff

.gitignore

@@ -1,18 +1,17 @@
 npm-debug.log
 *.log
-/plugins/vorlon/**/*.css
 tsconfig.json
 /Plugins/obj
 **/node_modules
 sync.bat
 *.suo
 /.vs/
 bin/
-GLE id�es.txt
+**/control.css
 sync.bat
-Plugins/Vorlon/plugins/remoteDebugging.zip
 .settings/launch.json
 *.dat
 Server/public/stylesheets/style.css
-vorlon
 /Server/public/stylesheets/style.css
+/DeploymentTools/deployment-package.zip
+DeploymentTools/deployment-package.zip

.vscode/launch.json

@@ -19,9 +19,11 @@
 			// Workspace relative or absolute path to the runtime executable to be used. Default is the runtime executable on the PATH.
 			"runtimeExecutable": null,
 			// Optional arguments passed to the runtime executable.
-			"runtimeArgs": ["--nolazy"],
+			"runtimeArgs": [
+				"--nolazy"
+			],
 			// Environment variables passed to the program.
-			"env": { },
+			"env": {},
 			// Use JavaScript source maps (if they exist).
 			"sourceMaps": false,
 			// If JavaScript source maps are enabled, the generated code is expected in this directory.
@@ -35,6 +37,58 @@
 			// Port to attach to.
 			"port": 5858,
 			"sourceMaps": false
+		},
+		{
+			// not working since latest vs code and electron versions :-(
+			"name": "Launch desktop App",
+			"type": "node",
+			"program": "desktop/app/background.js",
+			"stopOnEntry": false,
+			"args": [
+				"--dev"
+			],
+			"cwd": ".",
+			"runtimeExecutable": "desktop/node_modules/electron-prebuilt/dist/electron.exe",
+			"env": {}
+		},
+        {
+			// not working since latest vs code and electron versions :-(
+			"name": "Launch node.js sample",
+			"type": "node",
+			"program": "client samples/nodejs/app.js",
+			"stopOnEntry": false,
+			"args": [
+				"--nolazy"
+			],
+			"cwd": ".",
+			"runtimeExecutable": null,
+			"env": {}
+		},
+		{
+			// Name of configuration; appears in the launch configuration drop down menu.
+			"name": "Launch w/TypeScript",
+			// Type of configuration. Possible values: "node", "mono".
+			"type": "node",
+			// Workspace relative or absolute path to the program.
+			"program": "Server/server.ts",
+			// Automatically stop program after launch.
+			"stopOnEntry": false,
+			// Command line arguments passed to the program.
+			"args": [],
+			// Workspace relative or absolute path to the working directory of the program being debugged. Default is the current workspace.
+			"cwd": ".",
+			// Workspace relative or absolute path to the runtime executable to be used. Default is the runtime executable on the PATH.
+			"runtimeExecutable": null,
+			// Optional arguments passed to the runtime executable.
+			"runtimeArgs": [
+				"--nolazy"
+			],
+			// Environment variables passed to the program.
+			"env": {},
+			// Use JavaScript source maps (if they exist).
+			"sourceMaps": true,
+			// If JavaScript source maps are enabled, the generated code is expected in this directory.
+			"outDir": null
 		}
 	]
-}
+}

.vscode/tasks.json

@@ -0,0 +1,20 @@
+// Available variables which can be used inside of strings.
+// ${workspaceRoot}: the root folder of the team
+// ${file}: the current opened file
+// ${fileBasename}: the current opened file's basename
+// ${fileDirname}: the current opened file's dirname
+// ${fileExtname}: the current opened file's extension
+// ${cwd}: the current working directory of the spawned process
+
+{
+	"version": "0.1.0",
+	"command": "gulp",
+	"isShellCommand": true,
+	"tasks": [
+		{
+			"taskName": "default",
+			"isBuildCommand": true,
+			"showOutput": "always"
+		}
+	]
+}

DeploymentTools/Dockerfile

@@ -0,0 +1,29 @@
+# use the node argon image as base
+FROM node:argon
+
+# Set the Vorlon.JS Docker Image maintainer
+MAINTAINER Julien Corioland (Microsoft, DX)
+
+# update apt get and install unzip
+RUN apt-get -qq update && apt-get -qqy install unzip
+
+# Create the application directory
+RUN mkdir -p /usr/src/vorlonjs
+
+# Set app root as working directory
+WORKDIR /usr/src/vorlonjs
+
+# Send the app content to the container
+COPY deployment-package.zip /usr/src/vorlonjs
+
+# Extract the archive
+RUN unzip deployment-package.zip -d /usr/src/vorlonjs
+
+# Remove the archive
+RUN rm deployment-package.zip
+
+# Expose port 1337
+EXPOSE 1337
+
+# Run Vorlon.JS
+CMD ["npm", "start"]

DeploymentTools/build-docker-image.cmd

@@ -0,0 +1,28 @@
+@ECHO OFF
+
+IF "%1"=="" GOTO :usage
+IF "%2"=="" GOTO :usage
+IF "%3"=="" GOTO :usage
+IF "%4"=="" GOTO :usage
+IF "%5"=="" GOTO :usage
+
+@ECHO "SET DOCKER_HOST TO %1"
+SET DOCKER_HOST=%1
+
+@ECHO "BUILD DOCKER IMAGE"
+docker --tls --tlscacert="%2\ca.pem" --tlscert="%2\cert.pem" --tlskey="%2\key.pem" build -t jcorioland/vorlonjs:0.2 .
+
+@ECHO "LOG INTO DOCKER HUB"
+docker --tls --tlscacert="%2\ca.pem" --tlscert="%2\cert.pem" --tlskey="%2\key.pem" login --username="%3" --password="%4" --email="%5" https://index.docker.io/v1/
+
+@ECHO "PUSH IMAGE INTO DOCKER HUB"
+docker --tls --tlscacert="%2\ca.pem" --tlscert="%2\cert.pem" --tlskey="%2\key.pem" push jcorioland/vorlonjs:0.2
+
+@ECHO "LOG OUT FROM DOCKER HUB"
+docker --tls --tlscacert="%2\ca.pem" --tlscert="%2\cert.pem" --tlskey="%2\key.pem" logout
+
+GOTO :eof
+
+:usage
+@ECHO Usage: %0 ^<DOCKER_HOST^> ^<CERT_FOLDER^> ^<DOCKER_HUB_USERNAME^> ^<DOCKER_HUB_PASSWORD^>
+EXIT /B 1