[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
elastic · Apr 8, 2024 · 6770af0 · 6770af0
1 parent df4f16e
commit 6770af0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt
@@ -1,12 +1,19 @@
+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==2023.7.22
 chardet==3.0.4
 deepdiff==4.2.0
+<<<<<<< HEAD
 docker==6.0.1
 docker-compose==1.29.2
+=======
+>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2
@@ -37,16 +44,23 @@ pytest==7.3.2
 pytest-rerunfailures==9.1.1
 pytest-timeout==1.4.2
 PyYAML==5.3.1
+<<<<<<< HEAD
 redis==4.4.4
 requests==2.31.0
+=======
+redis==2.10.6
+>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
 semver==2.8.1
 setuptools==65.5.1
 six==1.15.0
 stomp.py==4.1.22
 termcolor==1.1.0
 texttable==0.9.1
 toml==0.10.1
+<<<<<<< HEAD
 urllib3==1.26.5
+=======
+>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
 wcwidth==0.2.5
 websocket-client==0.47.0
 zipp>=1.2.0,<=3.1.0

diff --git a/libbeat/tests/system/requirements_aix.txt b/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==2023.7.22
 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
@@ -36,16 +39,23 @@ pytest==7.3.2
 pytest-rerunfailures==9.1.1
 pytest-timeout==1.4.2
 PyYAML==5.3.1
+<<<<<<< HEAD
 redis==4.4.4
 requests==2.31.0
+=======
+redis==2.10.6
+>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
 semver==2.8.1
 setuptools==65.5.1
 six==1.15.0
 stomp.py==4.1.22
 termcolor==1.1.0
 texttable==0.9.1
 toml==0.10.1
+<<<<<<< HEAD
 urllib3==1.26.5
+=======
+>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
 wcwidth==0.2.5
 websocket-client==0.47.0
 zipp>=1.2.0,<=3.1.0
diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,9 @@
+<<<<<<< HEAD
 FROM golang:1.20.12
+=======
+FROM golang:1.21.9
+COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/
+>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
 
 RUN \
     apt update \
@@ -8,8 +13,13 @@ RUN \
          python3-dev \
          python3-pip \
          python3-venv \
+<<<<<<< HEAD
          libaio-dev \
          unzip \
+=======
+         libssl-dev \
+         libffi-dev \
+>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
       && rm -rf /var/lib/apt/lists/*
 
 # Use a virtualenv to avoid the PEP668 "externally managed environment" error caused by conflicts
@@ -19,9 +29,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 \