fix: iotedgehubdev docker dependencies

.devcontainer/library-scripts/docker-in-docker-debian.sh

@@ -116,7 +116,7 @@ if type docker-compose > /dev/null 2>&1; then
 else
     target_compose_arch="${architecture}"
     if [ "${target_compose_arch}" != "x86_64" ]; then
-        # Use pip to get a version that runns on this architecture
+        # Use pip to get a version that runs on this architecture
         if ! dpkg -s python3-minimal python3-pip libffi-dev python3-venv > /dev/null 2>&1; then
             apt_get_update_if_needed
             apt-get -y install python3-minimal python3-pip libffi-dev python3-venv

.gitignore

@@ -108,3 +108,5 @@ venv.bak/
 tests/output/
 
 .vscode/tags
+.idea
+.DS_Store

iotedgehubdev.spec

@@ -9,9 +9,9 @@ block_cipher = None
 a = Analysis(['main.py'],
              pathex=['.'],
              binaries=[],
-             datas=[('.\\ThirdPartyNotice.html', '.')],
+             datas=[('./ThirdPartyNotice.html', '.')],
              hiddenimports=[],
-             hookspath=['.\\pyinstaller'],
+             hookspath=['./pyinstaller'],
              runtime_hooks=[],
              excludes=[],
              win_no_prefer_redirects=False,

iotedgehubdev/composeproject.py

@@ -7,12 +7,12 @@
 import sys
 import yaml
 
+
 from collections import OrderedDict
 from io import StringIO
 from .compose_parser import CreateOptionParser
 from .output import Output
 
-COMPOSE_VERSION = 3.6
 
 CREATE_OPTIONS_MAX_CHUNKS = 100
 
@@ -191,7 +191,6 @@ def represent_dict_order(self, data):
         def my_unicode_repr(self, data):
             return self.represent_str(data.encode('utf-8'))
 
-        self.yaml_dict['version'] = str(COMPOSE_VERSION)
         self.yaml_dict['services'] = self.Services
         self.yaml_dict['networks'] = self.Networks
         self.yaml_dict['volumes'] = self.Volumes

iotedgehubdev/edgemanager.py

@@ -67,8 +67,8 @@ def stop(edgedockerclient=None):
         label_err = None
         try:
             if os.path.exists(EdgeManager.COMPOSE_FILE):
-                cmd = "docker-compose -f {0} down".format(EdgeManager.COMPOSE_FILE)
-                Utils.exe_proc(cmd.split())
+                cmd_down = ['docker', 'compose', '-f', EdgeManager.COMPOSE_FILE, 'down']
+                Utils.exe_proc(cmd_down)
         except Exception as e:
             compose_err = e
 
@@ -196,12 +196,12 @@ def start_solution(self, module_content, verbose, output):
         except Exception as e:
             output.warning(str(e))
 
-        cmd_pull = ['docker-compose', '-f', EdgeManager.COMPOSE_FILE, 'pull', EdgeManager.EDGEHUB]
+        cmd_pull = ['docker', 'compose', '-f', EdgeManager.COMPOSE_FILE, 'pull', EdgeManager.EDGEHUB]
         Utils.exe_proc(cmd_pull)
         if verbose:
-            cmd_up = ['docker-compose', '-f', EdgeManager.COMPOSE_FILE, 'up']
+            cmd_up = ['docker', 'compose', '-f', EdgeManager.COMPOSE_FILE, 'up']
         else:
-            cmd_up = ['docker-compose', '-f', EdgeManager.COMPOSE_FILE, 'up', '-d']
+            cmd_up = ['docker', 'compose', '-f', EdgeManager.COMPOSE_FILE, 'up', '-d']
         Utils.exe_proc(cmd_up)
 
     def update_module_twin(self, module_content):

requirements.txt

@@ -1,19 +1,18 @@
 autopep8
 backports.unittest-mock
 click
-docker==5.0.3
+docker==7.1.0
 flake8==4.0.1
-pyOpenSSL==22.0.0
+pyOpenSSL==24.0.0
 python-dotenv
-requests>=2.25.1
+requests>=2.32.3
 applicationinsights==0.11.9
 prompt_toolkit
 rope
 tox
 pyyaml>=5.4
 jsonpath_rw
-docker-compose==1.29.1
 pytest
-pyinstaller==4.10
+pyinstaller==6.10.0
 urllib3>=1.26.4
 regex

setup.py

@@ -27,13 +27,12 @@
 
 dependencies = [
     'click',
-    'docker==5.0.3',
-    'pyOpenSSL==22.0.0',
-    'requests>=2.25.1',
+    'docker==7.1.0',
+    'pyOpenSSL==24.0.0',
+    'requests>=2.32.3',
     'applicationinsights==0.11.9',
     'pyyaml>=5.4',
     'jsonpath_rw',
-    'docker-compose==1.29.1',
     'regex'
 ]