From 1cd4a330187611a738c75292cd6fa6892e1c20a1 Mon Sep 17 00:00:00 2001 From: Jeffrey Gerard Date: Tue, 21 Jul 2026 09:40:22 -0500 Subject: [PATCH 1/2] Use create_and_update_app in deploy_one_click_app Replaces the separate create_app/update_app/deploy_app calls with a single create_and_update_app call, making the code more DRY. --- caprover_api/caprover_api.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/caprover_api/caprover_api.py b/caprover_api/caprover_api.py index 0b61b79..dc51272 100644 --- a/caprover_api/caprover_api.py +++ b/caprover_api/caprover_api.py @@ -419,15 +419,15 @@ def deploy_one_click_app( service_override_dict, default_style="|" ) - # create app - self.create_app( - app_name=service_name, - has_persistent_data=has_persistent_data - ) + image_name = service_data.get("image") + docker_file_lines = caprover_extras.get("dockerfileLines") - # update app - self.update_app( + # create + update + deploy in one call + self.create_and_update_app( app_name=service_name, + has_persistent_data=has_persistent_data, + image_name=image_name, + docker_file_lines=docker_file_lines, instance_count=1, persistent_directories=persistent_directories, environment_variables=environment_variables, @@ -436,13 +436,6 @@ def deploy_one_click_app( serviceUpdateOverride=service_update_override, tags=tags, ) - image_name = service_data.get("image") - docker_file_lines = caprover_extras.get("dockerfileLines") - self.deploy_app( - service_name, - image_name=image_name, - docker_file_lines=docker_file_lines - ) apps_deployed.append(service_name) return { "status": CaproverAPI.Status.STATUS_OK, From 780e465d7b7de7fcfde40c765abfff7b26548882 Mon Sep 17 00:00:00 2001 From: Jeffrey Gerard Date: Tue, 21 Jul 2026 09:58:27 -0500 Subject: [PATCH 2/2] Patch version bump: 0.1.25 --- HISTORY.rst | 7 +++++++ caprover_api/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 7b5e777..a1ebf9b 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,13 @@ History ======= +0.1.25 (2026-07-21) +------------------- + +* Use `create_and_update_app` from `deploy_one_click_app`. + This attempts to avoid a rare race condition when `deploy_one_click_app()` calls + `update_app` too quickly after `create_app`: `create_and_update_app` includes some sleeps. + 0.1.24 (2024-12-16) ------------------- diff --git a/caprover_api/__init__.py b/caprover_api/__init__.py index 47d01db..82a6ced 100644 --- a/caprover_api/__init__.py +++ b/caprover_api/__init__.py @@ -2,4 +2,4 @@ __author__ = """Akash Agarwal""" __email__ = 'agwl.akash@gmail.com' -__version__ = '0.1.24' +__version__ = '0.1.25' diff --git a/setup.cfg b/setup.cfg index 3759c9a..2c1642d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.24 +current_version = 0.1.25 commit = True tag = True diff --git a/setup.py b/setup.py index 6cec844..e5d13f2 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,6 @@ test_suite='tests', tests_require=test_requirements, url='https://github.com/ak4zh/caprover-api', - version='0.1.24', + version='0.1.25', zip_safe=False, )