Merge pull request #155 from gefyrahq/#154

fix(#154): pin docker release
gefyrahq · Aug 19, 2022 · 94ad1cf · 94ad1cf
2 parents 59b9776 + d1115de
commit 94ad1cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/python-tester.yaml b/.github/workflows/python-tester.yaml
@@ -96,6 +96,10 @@ jobs:
       working-directory: ./client
       run: |
         poetry run coverage run -a -m gefyra check
+    - name: Run gefyra version
+      working-directory: ./client
+      run: |
+        poetry run coverage run -a -m gefyra version
     - name: Run gefyra up with invalid kubeconfig path
       working-directory: ./client
       shell: bash --noprofile --norc -o pipefail {0}

diff --git a/client/gefyra/__main__.py b/client/gefyra/__main__.py
@@ -263,16 +263,22 @@ def get_client_configuration(args) -> ClientConfiguration:
 
 def main():
     try:
-        from gefyra import configuration
+        from gefyra import configuration as configuration_package
         from gefyra.api import bridge, down, run, unbridge, unbridge_all, up
         from gefyra.local.check import probe_kubernetes, probe_docker
 
         args = parser.parse_args()
+
+        if args.action == "version":
+            check = not args.no_check
+            version(configuration_package, check)
+            exit(0)
+
         if args.debug:
             logger.setLevel(logging.DEBUG)
         else:
             logger.setLevel(logging.INFO)
-        logger.addHandler(configuration.console)
+        logger.addHandler(configuration_package.console)
 
         configuration = get_client_configuration(args)
 
@@ -323,9 +329,6 @@ def main():
         elif args.action == "check":
             probe_docker()
             probe_kubernetes(config=configuration)
-        elif args.action == "version":
-            check = not args.no_check
-            version(configuration, check)
         elif args.action == "telemetry":
             telemetry_command(on=args.on, off=args.off)
         else:

diff --git a/client/pyoxidizer.bzl b/client/pyoxidizer.bzl
@@ -38,7 +38,7 @@ def make_exe():
 
     # linux, mac
     exe.add_python_resources(exe.read_package_root(CWD, ["gefyra"]))
-    exe.add_python_resources(exe.pip_install(["--no-deps", "docker"]))
+    exe.add_python_resources(exe.pip_install(["--no-deps", "docker==5.0.3"]))
     exe.add_python_resources(exe.pip_install(["kubernetes"]))
     exe.add_python_resources(exe.pip_install(["tabulate"]))
     exe.add_python_resources(exe.pip_install(["cli-tracker"]))
@@ -73,7 +73,7 @@ def make_win_exe():
 
     # windows
     exe.add_python_resources(exe.read_package_root(CWD, ["gefyra"]))
-    exe.add_python_resources(exe.pip_install(["--no-deps", "docker"]))
+    exe.add_python_resources(exe.pip_install(["--no-deps", "docker==5.0.3"]))
     exe.add_python_resources(exe.pip_install(["kubernetes"]))
     exe.add_python_resources(exe.pip_install(["pywin32"]))
     exe.add_python_resources(exe.pip_install(["tabulate"]))