-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to Go 1.19.10 and handle changes in golang Debian base image (#…
…35780) * Explicitly install netcat-openbsd everywhere. The plain netcat package appears to have been removed in the latest golang:1.19.10 base image. * Setup a virtualenv in Docker containers. This fixes the PEP668 error about "externally managed environments" which prevents modifying the system python installation. * Revert "Revert "[Automation] Bump Golang version to 1.19.10 (#35751)" (#35784)" This reverts commit 27b1799. * Reword CHANGELOG.next.asciidoc Co-authored-by: subham sarkar <[email protected]> * Improve PEP668 comments. * Install latest PyYAML in test containers. * Add check to see if already in a venv. * Upgrade pytest and py. Remove dependency on pytest-otel as it prevented upgrading pytest. * Check for pre-set virtualenv earlier. * Always create a fresh virtualenv in Docker. Remove duplicate dependencies from the docker files. * Fix metricbeat integration tests. * Force install Python dependencies for Metricbeat. --------- Co-authored-by: subham sarkar <[email protected]> (cherry picked from commit 62374dd) # Conflicts: # dev-tools/mage/pytest.go # libbeat/docs/version.asciidoc # libbeat/tests/system/requirements.txt # libbeat/tests/system/requirements_aix.txt # metricbeat/Dockerfile
- Loading branch information
1 parent
7eb0f37
commit 1117692
Showing
22 changed files
with
109 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
1.19.9 | ||
1.19.10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,35 @@ | ||
FROM golang:1.19.9 | ||
FROM golang:1.19.10 | ||
|
||
RUN \ | ||
apt update \ | ||
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends \ | ||
netcat \ | ||
netcat-openbsd \ | ||
python3 \ | ||
python3-dev \ | ||
python3-pip \ | ||
python3-venv \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
|
||
# Use a virtualenv to avoid the PEP668 "externally managed environment" error caused by conflicts | ||
# with the system Python installation. golang:1.19.10 uses Debian 12 which now enforces PEP668. | ||
ENV VIRTUAL_ENV=/opt/venv | ||
RUN python3 -m venv $VIRTUAL_ENV | ||
ENV PATH="$VIRTUAL_ENV/bin:$PATH" | ||
|
||
RUN pip3 install --upgrade pip==20.1.1 | ||
RUN pip3 install --upgrade setuptools==47.3.2 | ||
RUN pip3 install --upgrade docker-compose==1.23.2 | ||
RUN pip3 install --upgrade setuptools==47.3.2 | ||
RUN pip3 install --upgrade PyYAML==6.0.0 | ||
|
||
<<<<<<< HEAD | ||
======= | ||
# Oracle instant client | ||
RUN cd /usr/lib \ | ||
&& curl -sLo instantclient-basic-linux.zip https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux.x64-19.6.0.0.0dbru.zip \ | ||
&& unzip instantclient-basic-linux.zip \ | ||
&& rm instantclient-basic-linux.zip | ||
ENV LD_LIBRARY_PATH=/usr/lib/instantclient_19_6 | ||
|
||
>>>>>>> 62374dd251 (Upgrade to Go 1.19.10 and handle changes in golang Debian base image (#35780)) | ||
# Add healthcheck for the docker/healthcheck metricset to check during testing. | ||
HEALTHCHECK CMD exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
ARG AEROSPIKE_VERSION | ||
FROM aerospike:${AEROSPIKE_VERSION} | ||
|
||
RUN apt-get update && apt-get install -y netcat | ||
RUN apt-get update && apt-get install -y netcat-openbsd | ||
HEALTHCHECK --interval=1s --retries=90 CMD nc -z localhost 3000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG MONGODB_VERSION | ||
FROM mongo:${MONGODB_VERSION} | ||
RUN apt update && yes | apt install netcat | ||
RUN apt update && yes | apt install netcat-openbsd | ||
HEALTHCHECK --interval=1s --retries=90 CMD nc -z localhost 27017 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
ARG RABBITMQ_VERSION | ||
FROM rabbitmq:${RABBITMQ_VERSION}-management | ||
|
||
RUN apt-get update && apt-get install -y netcat && apt-get clean | ||
RUN apt-get update && apt-get install -y netcat-openbsd && apt-get clean | ||
HEALTHCHECK --interval=1s --retries=90 CMD nc -w 1 -v 127.0.0.1 15672 </dev/null | ||
EXPOSE 15672 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters