Fix pass docker repo command back to the cluster config (Azure#538)

timotheeguerin · web-flow · commit a99bbe19e64b · 2018-05-03T08:48:38.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,14 @@
 my-custom-scripts/
 .aztk
 
-# Virtual environments
+# Environments
+.env
+.venv
+env/
+venv/
 ENV/
+env.bak/
+venv.bak/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,5 +15,6 @@
   "python.formatting.yapfArgs": [
     "--style=.style.yapf"
   ],
-  "python.pythonPath": "${workspaceFolder}\\ENV\\Scripts\\python.exe"
+  "python.venvPath": "${workspaceFolder}/.venv/",
+  "python.pythonPath": "${workspaceFolder}/.venv/Scripts/python.exe"
 }
diff --git a/aztk_cli/spark/endpoints/cluster/cluster_create.py b/aztk_cli/spark/endpoints/cluster/cluster_create.py
@@ -50,6 +50,10 @@ def execute(args: typing.NamedTuple):
             username=args.username,
             password=args.password,
         )))
+
+    if args.docker_repo and cluster_conf.toolkit:
+        cluster_conf.toolkit.docker_repo = args.docker_repo
+
     wait = wait if args.wait is None else args.wait
 
     user_configuration = cluster_conf.user_configuration

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,6 @@`
`15`	`15`	`"python.formatting.yapfArgs": [`
`16`	`16`	`"--style=.style.yapf"`
`17`	`17`	`],`
`18`		`- "python.pythonPath": "${workspaceFolder}\\ENV\\Scripts\\python.exe"`
	`18`	`+ "python.venvPath": "${workspaceFolder}/.venv/",`
	`19`	`+ "python.pythonPath": "${workspaceFolder}/.venv/Scripts/python.exe"`
`19`	`20`	`}`