[8.13](backport #38743) [7.17] Fix Python systems tests with forked d…

…ocker-compose package (#38746) * [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. (cherry picked from commit 33b776a) # Conflicts: # libbeat/tests/system/requirements.txt # libbeat/tests/system/requirements_aix.txt # metricbeat/Dockerfile * Resolve conflicts * Restore uintentionally removed packages * Remove duplicate package. * Add dropped docker copy --------- Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
elastic · Apr 7, 2024 · cbcfef6 · cbcfef6
1 parent cba3034
commit cbcfef6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt
@@ -1,3 +1,7 @@
+requests==2.31.0
+urllib3==1.26.18
+docker==6.1.3
+docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix
 async-timeout==4.0.3
 attrs==19.3.0
 autopep8==1.5.4
@@ -13,8 +17,6 @@ cryptography==41.0.7
 deepdiff==4.2.0
 Deprecated==1.2.14
 distro==1.9.0
-docker==6.0.1
-docker-compose==1.29.2
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2
@@ -58,7 +60,6 @@ pytest-timeout==1.4.2
 python-dotenv==0.21.1
 PyYAML==5.3.1
 redis==4.4.4
-requests==2.31.0
 semver==2.8.1
 six==1.15.0
 stomp.py==4.1.22
@@ -67,7 +68,6 @@ texttable==0.9.1
 toml==0.10.1
 tomli==2.0.1
 typing_extensions==4.9.0
-urllib3==1.26.18
 wcwidth==0.2.5
 websocket-client==0.47.0
 wrapt==1.16.0

diff --git a/libbeat/tests/system/requirements_aix.txt b/libbeat/tests/system/requirements_aix.txt
@@ -13,8 +13,6 @@ cryptography==41.0.7
 deepdiff==4.2.0
 Deprecated==1.2.14
 distro==1.9.0
-docker==6.0.1
-docker-compose==1.29.2
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2
@@ -58,7 +56,6 @@ pytest-timeout==1.4.2
 python-dotenv==0.21.1
 PyYAML==5.3.1
 redis==4.4.4
-requests==2.31.0
 semver==2.8.1
 six==1.15.0
 stomp.py==4.1.22
@@ -67,7 +64,6 @@ texttable==0.9.1
 toml==0.10.1
 tomli==2.0.1
 typing_extensions==4.9.0
-urllib3==1.26.18
 wcwidth==0.2.5
 websocket-client==0.47.0
 wrapt==1.16.0

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,5 @@
 FROM golang:1.21.8
+COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker  /usr/local/bin/
 
 RUN \
     apt update \
@@ -10,6 +11,8 @@ RUN \
          python3-venv \
          libaio-dev \
          unzip \
+         libssl-dev \
+         libffi-dev \
       && rm -rf /var/lib/apt/lists/*
 
 # Use a virtualenv to avoid the PEP668 "externally managed environment" error caused by conflicts
@@ -19,9 +22,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
 
 # Oracle instant client
 RUN cd /usr/lib \