[7.17] Fix Python systems tests with forked docker-compose package (#…

…38743)

* Manual port of docker CI fix from #38199

* Fix order in requirements.txt.

libbeat/tests/system/requirements.txt

@@ -1,12 +1,14 @@
+requests==2.31.0
+urllib3==1.26.18
+docker==6.1.3
+docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix
 attrs==19.3.0
 autopep8==1.5.4
 backports.ssl-match-hostname==3.5.0.1
 cached-property==1.4.2
 certifi==2018.1.18
 chardet==3.0.4
 deepdiff==4.2.0
-docker==4.1.0
-docker-compose==1.25.3
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2
@@ -38,15 +40,13 @@ pytest-rerunfailures==9.1.1
 pytest-timeout==1.4.2
 PyYAML==5.3.1
 redis==2.10.6
-requests==2.25.1
 semver==2.8.1
 setuptools==47.3.2
 six==1.15.0
 stomp.py==4.1.22
 termcolor==1.1.0
 texttable==0.9.1
 toml==0.10.1
-urllib3==1.26.18
 wcwidth==0.2.5
 websocket-client==0.47.0
 zipp>=1.2.0,<=3.1.0

libbeat/tests/system/requirements_aix.txt

@@ -1,11 +1,14 @@
+requests==2.31.0
+urllib3==1.26.18
+docker==6.1.3
+docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix
 attrs==19.3.0
 autopep8==1.5.4
 backports.ssl-match-hostname==3.5.0.1
 cached-property==1.4.2
 certifi==2018.1.18
 chardet==3.0.4
 deepdiff==4.2.0
-docker==4.1.0
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2
@@ -37,15 +40,13 @@ pytest-rerunfailures==9.1.1
 pytest-timeout==1.4.2
 PyYAML==5.3.1
 redis==2.10.6
-requests==2.25.1
 semver==2.8.1
 setuptools==47.3.2
 six==1.15.0
 stomp.py==4.1.22
 termcolor==1.1.0
 texttable==0.9.1
 toml==0.10.1
-urllib3==1.26.18
 wcwidth==0.2.5
 websocket-client==0.47.0
 zipp>=1.2.0,<=3.1.0

metricbeat/Dockerfile

@@ -1,4 +1,5 @@
 FROM golang:1.21.9
+COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/
 
 RUN \
     apt update \
@@ -8,6 +9,8 @@ RUN \
          python3-dev \
          python3-pip \
          python3-venv \
+         libssl-dev \
+         libffi-dev \
       && rm -rf /var/lib/apt/lists/*
 
 # Use a virtualenv to avoid the PEP668 "externally managed environment" error caused by conflicts
@@ -17,9 +20,12 @@ RUN python3 -m venv $VIRTUAL_ENV
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
 RUN pip3 install --upgrade pip==20.1.1
-RUN pip3 install --upgrade docker-compose==1.23.2
 RUN pip3 install --upgrade setuptools==47.3.2
 RUN pip3 install --upgrade PyYAML==5.3.1
+RUN pip3 install requests==2.31.0
+RUN pip3 install urllib3==1.26.18
+RUN pip3 install docker==6.1.3
+RUN pip3 install git+https://github.com/pkoutsovasilis/compose@v1_fix
 
 # Add healthcheck for the docker/healthcheck metricset to check during testing.
 HEALTHCHECK CMD exit 0