Skip to content

Commit

Permalink
[7.17] Fix Python systems tests with forked docker-compose package (#…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
cmacknz authored and mergify[bot] committed Apr 5, 2024
1 parent cba3034 commit 4d56aeb
Showing 3 changed files with 48 additions and 1 deletion.
17 changes: 17 additions & 0 deletions libbeat/tests/system/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<<<<<<< HEAD
async-timeout==4.0.3
=======
requests==2.31.0
urllib3==1.26.18
docker==6.1.3
docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix
>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
attrs==19.3.0
autopep8==1.5.4
backoff==2.2.1
@@ -11,10 +18,13 @@ chardet==3.0.4
charset-normalizer==3.3.2
cryptography==41.0.7
deepdiff==4.2.0
<<<<<<< HEAD
Deprecated==1.2.14
distro==1.9.0
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
@@ -57,17 +67,24 @@ pytest-rerunfailures==9.1.1
pytest-timeout==1.4.2
python-dotenv==0.21.1
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
six==1.15.0
stomp.py==4.1.22
termcolor==1.1.0
texttable==0.9.1
toml==0.10.1
<<<<<<< HEAD
tomli==2.0.1
typing_extensions==4.9.0
urllib3==1.26.18
=======
>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
wcwidth==0.2.5
websocket-client==0.47.0
wrapt==1.16.0
17 changes: 17 additions & 0 deletions libbeat/tests/system/requirements_aix.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<<<<<<< HEAD
async-timeout==4.0.3
=======
requests==2.31.0
urllib3==1.26.18
docker==6.1.3
docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix
>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
attrs==19.3.0
autopep8==1.5.4
backoff==2.2.1
@@ -11,10 +18,13 @@ chardet==3.0.4
charset-normalizer==3.3.2
cryptography==41.0.7
deepdiff==4.2.0
<<<<<<< HEAD
Deprecated==1.2.14
distro==1.9.0
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
@@ -57,17 +67,24 @@ pytest-rerunfailures==9.1.1
pytest-timeout==1.4.2
python-dotenv==0.21.1
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
six==1.15.0
stomp.py==4.1.22
termcolor==1.1.0
texttable==0.9.1
toml==0.10.1
<<<<<<< HEAD
tomli==2.0.1
typing_extensions==4.9.0
urllib3==1.26.18
=======
>>>>>>> 33b776a1b9 ([7.17] Fix Python systems tests with forked docker-compose package (#38743))
wcwidth==0.2.5
websocket-client==0.47.0
wrapt==1.16.0
15 changes: 14 additions & 1 deletion metricbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<<<<<<< HEAD
FROM golang:1.21.8
=======
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 \

0 comments on commit 4d56aeb

Please sign in to comment.