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

Jump to bottom

Fix PEP668 error installing cqlsh #3554

Merged
merged 2 commits into from
Aug 1, 2023
Merged

Fix PEP668 error installing cqlsh #3554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50b63ca
Fix PEP668 error installing cqlsh
llinder Aug 1, 2023
62f5a76
Fix mysql version
llinder Aug 1, 2023
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
3 changes: 3 additions & 0 deletions docker/test-images/zipkin-cassandra/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@ apk add --update --no-cache python3 py3-pip
# the following are necessary for compiling cffi. If pip someday changes and
# doesn't compile cffi on arrch64 then we can remove these dependencies.
apk add --update --no-cache gcc python3-dev musl-dev libffi-dev
# PEP 668 protects against mixing system and pip packages. Setup virtual env to avoid this.
python3 -m venv .venv
source .venv/bin/activate
pip install -Iq cqlsh
function cql() {
cqlsh --cqlversion=${cqlversion} "$@" 127.0.0.1 ${temp_native_transport_port}
Expand Down
2 changes: 1 addition & 1 deletion docker/test-images/zipkin-mysql/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ HEALTHCHECK --interval=1s --start-period=30s --timeout=5s CMD ["docker-healthche
ENTRYPOINT ["start-mysql"]

# Use latest from https://pkgs.alpinelinux.org/packages?name=mysql
ARG mysql_version=10.11.3
ARG mysql_version=10.11.4
LABEL mysql-version=$mysql_version
ENV MYSQL_VERSION=$mysql_version

Expand Down
Loading