Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Apr 5, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ab0e0a
Manual port of docker CI fix from https://github.com/elastic/beats/pu…
cmacknz Apr 5, 2024
b7918e5
Fix order in requirements.txt.
cmacknz Apr 5, 2024
a338fc9
Merge branch '7.17' into fix-python-system-tests
cmacknz Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libbeat/tests/system/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ 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==6.1.3
cmacknz marked this conversation as resolved.
Show resolved Hide resolved
docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix
docker-pycreds==0.4.0
dockerpty==0.4.1
docopt==0.6.2
Expand Down Expand Up @@ -38,7 +38,7 @@ pytest-rerunfailures==9.1.1
pytest-timeout==1.4.2
PyYAML==5.3.1
redis==2.10.6
requests==2.25.1
requests==2.31.0
semver==2.8.1
setuptools==47.3.2
six==1.15.0
Expand Down
6 changes: 4 additions & 2 deletions libbeat/tests/system/requirements_aix.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ cached-property==1.4.2
certifi==2018.1.18
chardet==3.0.4
deepdiff==4.2.0
docker==4.1.0
docker==6.1.3
cmacknz marked this conversation as resolved.
Show resolved Hide resolved
docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix
docker-pycreds==0.4.0
dockerpty==0.4.1
docopt==0.6.2
Expand Down Expand Up @@ -37,7 +38,7 @@ pytest-rerunfailures==9.1.1
pytest-timeout==1.4.2
PyYAML==5.3.1
redis==2.10.6
requests==2.25.1
requests==2.31.0
semver==2.8.1
setuptools==47.3.2
six==1.15.0
Expand All @@ -49,3 +50,4 @@ urllib3==1.26.18
wcwidth==0.2.5
websocket-client==0.47.0
zipp>=1.2.0,<=3.1.0
protobuf==3.19.4 #Temporary change because of protobuf new version bug: https://github.com/protocolbuffers/protobuf/issues/10051
cmacknz marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 7 additions & 1 deletion metricbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
Expand All @@ -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
Loading