Merge pull request Azure#14 from cormacpayne/corm/misc-containerapp-c…

…hanges

Miscellaneous changes to containerapp module

src/containerapp/azext_containerapp/_utils.py

@@ -8,6 +8,7 @@
 import json
 import platform
 import docker
+import stat
 import io
 import os
 import requests
@@ -1746,7 +1747,6 @@ def is_docker_running():
 
 def get_pack_exec_path():
     try:
-
         dir_path = os.path.dirname(os.path.realpath(__file__))
         bin_folder = os.path.join(dir_path, "bin")
         if not os.path.exists(bin_folder):
@@ -1787,6 +1787,11 @@ def get_pack_exec_path():
                         with open(exec_path, "wb") as f:
                             f.write(tar.extractfile(tar_info).read())
 
+        # Add executable permissions for the current user if they don't exist
+        if not os.access(exec_path, os.X_OK):
+            st = os.stat(exec_path)
+            os.chmod(exec_path, st.st_mode | stat.S_IXUSR)
+
         return exec_path
     except Exception as e:
         # Swallow any exceptions thrown when attempting to install pack CLI

src/containerapp/requirements.txt

@@ -0,0 +1 @@
+docker>=6.1.2

src/containerapp/setup.py

@@ -49,7 +49,7 @@
 # TODO: Add any additional SDK dependencies here
 DEPENDENCIES = [
     'pycomposefile>=0.0.29',
-    'docker'
+    'docker>=6.1.2'
 ]
 
 # Install pack CLI to build runnable application images from source