feat(package): add support for nested docker images.

Pipfile

@@ -24,7 +24,7 @@ graphlib-backport = ">=1.0.3"
 jinja2 = ">=3.0.1"
 munch = ">=2.4.0"
 pyyaml = ">=5.4.1"
-rapyuta-io = ">=1.13.0"
+rapyuta-io = ">=1.14.0"
 tabulate = ">=0.8.0"
 pyrfc3339 = ">=1.1"
 directory-tree = ">=0.0.3.1"

riocli/__init__.py

@@ -18,3 +18,11 @@
     pretty_traceback.install()
 except ImportError:
     pass  # no need to fail because of missing dev dependency
+
+# Patch `signal` to add SIGKILL for Windows. This is required for yaspin to work
+# on windows.
+from sys import platform
+
+if platform.lower() == 'win32':
+    import signal
+    signal.SIGKILL = signal.SIGTERM

riocli/jsonschema/schemas/package-schema.yaml

@@ -668,7 +668,7 @@ definitions:
     pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
   imageName:
     type: string
-    pattern: ^([a-zA-Z0-9])([\w.\-_]+((?::\d+|)(?=/[a-z0-9._-]+/[a-z0-9._-]+))|)(?:/|)([a-z0-9.\-_]+(?:/[a-z0-9.\-_]+|))(:([\w.\-_]{1,126})|)$
+    pattern: ^([a-zA-Z0-9])([\w.\-_]+((?::\d+|)(?=/[a-z0-9._-]+/[a-z0-9._-]+))|)(?:/|)([a-z0-9/.\-_]+(?:/[a-z0-9.\-_]+|))(:([\w.\-_]{1,126})|)$
   imagePullPolicy:
     type: string
     enum:

riocli/vpn/util.py

@@ -39,6 +39,8 @@ def get_host_name() -> str:
 def is_linux() -> bool:
     return platform.lower() == 'linux'
 
+def is_windows() -> bool:
+    return platform.lower() == 'win32'
 
 def is_curl_installed() -> bool:
     return which('curl') is not None
@@ -131,7 +133,7 @@ def is_vpn_enabled_in_project(client: v2Client, project_guid: str) -> bool:
 
 def get_command(cmd: str) -> str:
     """Returns an effective command to execute."""
-    if is_linux() and os.geteuid() == 0:
+    if is_windows() or (is_linux() and os.geteuid() == 0):
         return cmd
 
     return 'sudo {}'.format(cmd)

setup.py

@@ -47,7 +47,7 @@
         "python-dateutil>=2.8.2",
         "pytz",
         "pyyaml>=5.4.1",
-        "rapyuta-io>=1.13.0",
+        "rapyuta-io>=1.14.0",
         "requests>=2.20.0",
         "setuptools",
         "six>=1.13.0",