Merge pull request #97 from cloudify-cosmo/RD-6790-Handle-Get-API-Cha…

…nges RD-6790-Handle-Get-API-Changes
cloudify-cosmo · Jan 10, 2023 · 33c407e · 33c407e
2 parents c2da8ba + 5b2f03e
commit 33c407e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -21,4 +21,6 @@
 2.0.9:
   - Fix Deprecation from SocketIO and basic refactor for code readability.
   - Added support passing file and handled perparation for the container files accordingly.
-  - Added the clean up logic for the tmp files same as terraform plugin.
+  - Added the clean up logic for the tmp files same as terraform plugin.
+2.0.10:
+  - Fix get api due to back-compat issue.
diff --git a/cloudify_docker/tasks.py b/cloudify_docker/tasks.py
@@ -247,7 +247,7 @@ def follow_container_logs(ctx, docker_client, container, **kwargs):
 
     @handle_docker_exception
     def check_container_exited(docker_client, container):
-        result = docker_client.containers.get(container)
+        result = docker_client.containers.get(container.id)
         if result.status == 'exited':
             ctx.logger.info('Container exit_code {0}'.format(
                 result.attrs['State']['ExitCode']))
@@ -732,7 +732,7 @@ def create_container(ctx, docker_client, **kwargs):
         if container_args.get("detach", False):
             ctx.logger.info("command is running in detach mode True")
             ctx.instance.runtime_properties['container'] = container.id
-            container_info = docker_client.containers.get(container)
+            container_info = docker_client.containers.get(container.id)
             ctx.instance.runtime_properties['container_info'] = \
                 repr(container_info)
             return

diff --git a/plugin.yaml b/plugin.yaml
@@ -2,7 +2,7 @@ plugins:
   docker:
     executor: central_deployment_agent
     package_name: 'cloudify-docker-plugin'
-    package_version: '2.0.9'
+    package_version: '2.0.10'
 
 dsl_definitions:
 

diff --git a/plugin_1_4.yaml b/plugin_1_4.yaml
@@ -2,7 +2,7 @@ plugins:
   docker:
     executor: central_deployment_agent
     package_name: 'cloudify-docker-plugin'
-    package_version: '2.0.9'
+    package_version: '2.0.10'
 
 dsl_definitions:
 

diff --git a/plugin_1_5.yaml b/plugin_1_5.yaml
@@ -2,7 +2,7 @@ plugins:
   docker:
     executor: central_deployment_agent
     package_name: 'cloudify-docker-plugin'
-    package_version: '2.0.9'
+    package_version: '2.0.10'
 
 dsl_definitions:
 

diff --git a/v2_plugin.yaml b/v2_plugin.yaml
@@ -2,7 +2,7 @@ plugins:
   docker:
     executor: central_deployment_agent
     package_name: 'cloudify-docker-plugin'
-    package_version: '2.0.9'
+    package_version: '2.0.10'
 
 dsl_definitions: