Skip to content

Commit cbcfef6

Browse files
[8.13](backport #38743) [7.17] Fix Python systems tests with forked docker-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 <[email protected]>
1 parent cba3034 commit cbcfef6

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

libbeat/tests/system/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
requests==2.31.0
2+
urllib3==1.26.18
3+
docker==6.1.3
4+
docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix
15
async-timeout==4.0.3
26
attrs==19.3.0
37
autopep8==1.5.4
@@ -13,8 +17,6 @@ cryptography==41.0.7
1317
deepdiff==4.2.0
1418
Deprecated==1.2.14
1519
distro==1.9.0
16-
docker==6.0.1
17-
docker-compose==1.29.2
1820
docker-pycreds==0.4.0
1921
dockerpty==0.4.1
2022
docopt==0.6.2
@@ -58,7 +60,6 @@ pytest-timeout==1.4.2
5860
python-dotenv==0.21.1
5961
PyYAML==5.3.1
6062
redis==4.4.4
61-
requests==2.31.0
6263
semver==2.8.1
6364
six==1.15.0
6465
stomp.py==4.1.22
@@ -67,7 +68,6 @@ texttable==0.9.1
6768
toml==0.10.1
6869
tomli==2.0.1
6970
typing_extensions==4.9.0
70-
urllib3==1.26.18
7171
wcwidth==0.2.5
7272
websocket-client==0.47.0
7373
wrapt==1.16.0

libbeat/tests/system/requirements_aix.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ cryptography==41.0.7
1313
deepdiff==4.2.0
1414
Deprecated==1.2.14
1515
distro==1.9.0
16-
docker==6.0.1
17-
docker-compose==1.29.2
1816
docker-pycreds==0.4.0
1917
dockerpty==0.4.1
2018
docopt==0.6.2
@@ -58,7 +56,6 @@ pytest-timeout==1.4.2
5856
python-dotenv==0.21.1
5957
PyYAML==5.3.1
6058
redis==4.4.4
61-
requests==2.31.0
6259
semver==2.8.1
6360
six==1.15.0
6461
stomp.py==4.1.22
@@ -67,7 +64,6 @@ texttable==0.9.1
6764
toml==0.10.1
6865
tomli==2.0.1
6966
typing_extensions==4.9.0
70-
urllib3==1.26.18
7167
wcwidth==0.2.5
7268
websocket-client==0.47.0
7369
wrapt==1.16.0

metricbeat/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM golang:1.21.8
2+
COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/
23

34
RUN \
45
apt update \
@@ -10,6 +11,8 @@ RUN \
1011
python3-venv \
1112
libaio-dev \
1213
unzip \
14+
libssl-dev \
15+
libffi-dev \
1316
&& rm -rf /var/lib/apt/lists/*
1417

1518
# Use a virtualenv to avoid the PEP668 "externally managed environment" error caused by conflicts
@@ -19,9 +22,12 @@ RUN python3 -m venv $VIRTUAL_ENV
1922
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
2023

2124
RUN pip3 install --upgrade pip==20.1.1
22-
RUN pip3 install --upgrade docker-compose==1.23.2
2325
RUN pip3 install --upgrade setuptools==47.3.2
2426
RUN pip3 install --upgrade PyYAML==5.3.1
27+
RUN pip3 install requests==2.31.0
28+
RUN pip3 install urllib3==1.26.18
29+
RUN pip3 install docker==6.1.3
30+
RUN pip3 install git+https://github.com/pkoutsovasilis/compose@v1_fix
2531

2632
# Oracle instant client
2733
RUN cd /usr/lib \

0 commit comments

Comments
 (0)