Merge pull request #3524 from SwissDataScienceCenter/release/hotfix-check-migration-version

Panaetius · web-flow · commit bca49a48bc3c · 2023-06-14T10:17:04.000+02:00
fix(service): do not suggest updating dockerfile for release candidate versions
diff --git a/renku/core/migration/migrate.py b/renku/core/migration/migrate.py
@@ -227,8 +227,8 @@ def update_dockerfile(*, check_only=False) -> Tuple[bool, Optional[bool], Option
             "Couldn't update renku-python version in Dockerfile, as it doesn't contain an 'ARG RENKU_VERSION=...' line."
         )
 
-    current_version = Version(__version__)
-    if docker_version >= current_version:
+    current_version = Version(Version(__version__).base_version)
+    if Version(docker_version.base_version) >= current_version:
         return True, False, str(docker_version)
 
     if check_only:

Original file line number	Diff line number	Diff line change
`@@ -227,8 +227,8 @@ def update_dockerfile(*, check_only=False) -> Tuple[bool, Optional[bool], Option`
`227`	`227`	`"Couldn't update renku-python version in Dockerfile, as it doesn't contain an 'ARG RENKU_VERSION=...' line."`
`228`	`228`	`)`
`229`	`229`
`230`		`- current_version = Version(__version__)`
`231`		`- if docker_version >= current_version:`
	`230`	`+ current_version = Version(Version(__version__).base_version)`
	`231`	`+ if Version(docker_version.base_version) >= current_version:`
`232`	`232`	`return True, False, str(docker_version)`
`233`	`233`
`234`	`234`	`if check_only:`