Merge pull request #137 from EyeSeeTea/fix/use-docker-compose-v2

[feature] Support docker compose as plugin

Author: Ramon-Jimenez

README.md

@@ -9,7 +9,7 @@
 On Ubuntu 22.04:
 
 ```
-$ sudo apt install docker.io docker-compose python3 python3-setuptools
+$ sudo apt install docker.io docker-compose-v2 python3 python3-setuptools
 ```
 
 On Windows 10:

requirements.txt

@@ -1,6 +1,6 @@
-Flask==2.0.3
+Flask==3.1.0
 python-dotenv
 Flask_Cors==6.0.0
-Werkzeug==2.3.7
-requests==2.31.0
+requests==2.32.3
 PyYAML
+setuptools

setup.py

@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="d2_docker",
-    version="1.15.0.b1",
+    version="1.15.0.b2",
     description="Dockers for DHIS2 instances",
     long_description=open("README.md", encoding="utf-8").read(),
     keywords=["python"],

src/d2_docker/commands/version.py

@@ -1,4 +1,4 @@
-import pkg_resources  # part of setuptools
+from importlib.metadata import distribution
 import re
 from d2_docker import utils
 
@@ -11,7 +11,7 @@ def setup(_parser):
 
 def run(_args):
     utils.run(["docker", "-v"])
-    utils.run(["docker-compose", "-v"])
+    utils.run(["docker", "compose", "version"])
     d2_docker = get_d2_docker_version()
     if d2_docker:
         print("d2-docker version {}".format(d2_docker))
@@ -32,11 +32,11 @@ def get_field(command, field_index):
 
 def get_versions():
     docker = get_field(["docker", "-v"], 2)
-    docker_compose = get_field(["docker-compose", "-v"], 3)
+    docker_compose = get_field(["docker", "compose", "version"], 3)
     d2_docker = get_d2_docker_version()
     return dict({"docker": docker, "docker-compose": docker_compose, "d2-docker": d2_docker})
 
 
 def get_d2_docker_version():
-    resources = pkg_resources.require("d2-docker")
-    return resources[0].version if resources else None
+    dist = distribution("d2-docker")
+    return dist.version

src/d2_docker/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3"
 services:
     core:
         image: "${DHIS2_CORE_IMAGE}"

src/d2_docker/utils.py

@@ -10,7 +10,7 @@
 import time
 import yaml
 import urllib.request
-from distutils import dir_util
+from setuptools._distutils import dir_util
 from pathlib import Path
 from typing import Optional
 
@@ -308,7 +308,7 @@ def process_yaml(data):
 
     temp_compose = build_docker_compose(process_yaml)
 
-    return run(["docker-compose", "-f", temp_compose.name, "-p", project_name, *args], env=env, **kwargs)
+    return run(["docker", "compose", "-f", temp_compose.name, "-p", project_name, *args], env=env, **kwargs)
 
 
 def build_docker_compose(process_yaml):
@@ -553,7 +553,7 @@ def add_core_image_arg(parser):
 
 @contextlib.contextmanager
 def running_containers(image_name, *up_args, **run_docker_compose_kwargs):
-    """Start docker-compose services for an image in a context manager and stop it afterwards."""
+    """Start docker compose services for an image in a context manager and stop it afterwards."""
     try:
         run_docker_compose(["up", "-d", *up_args], image_name, **run_docker_compose_kwargs)
         status = get_image_status(image_name)