Skip to content
Snippets Groups Projects
Commit dff7052f authored by nimrod's avatar nimrod
Browse files

Workbench: Update pipx usage.

Use the new `--global` option for installation and remove the
environment variables that override the default behavior for the global
installations.
parent 7036e0ce
Branches
No related tags found
No related merge requests found
Pipeline #4351 failed
...@@ -10,7 +10,7 @@ RUN curl https://github.com/duckdb/duckdb/releases/download/v1.0.0/duckdb_cli-li ...@@ -10,7 +10,7 @@ RUN curl https://github.com/duckdb/duckdb/releases/download/v1.0.0/duckdb_cli-li
FROM registry.shore.co.il/toolbx:latest FROM registry.shore.co.il/toolbx:latest
COPY --from=temp /usr/local/bin/duckdb /usr/local/bin/ COPY --from=temp /usr/local/bin/duckdb /usr/local/bin/
SHELL ["/bin/bash", "-o", "pipefail", "-xc"] SHELL ["/bin/bash", "-o", "pipefail", "-xc"]
ENV PATH /opt/pipx/bin:/usr/local/lib/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV PATH /usr/local/lib/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# hadolint ignore=DL3008 # hadolint ignore=DL3008
RUN apt-get update && \ RUN apt-get update && \
curl "https://github.com/kubernetes/kompose/releases/download/v1.26.1/kompose_1.26.1_$(dpkg --print-architecture).deb" --output /tmp/kompose.deb && \ curl "https://github.com/kubernetes/kompose/releases/download/v1.26.1/kompose_1.26.1_$(dpkg --print-architecture).deb" --output /tmp/kompose.deb && \
...@@ -178,8 +178,6 @@ RUN apt-get update && \ ...@@ -178,8 +178,6 @@ RUN apt-get update && \
rm /etc/ssh/ssh_host_* && \ rm /etc/ssh/ssh_host_* && \
ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose && \ ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose && \
rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/* rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
ENV PIPX_HOME /opt/pipx
ENV PIPX_BIN_DIR /opt/pipx/bin
# hadolint ignore=DL3013 # hadolint ignore=DL3013
RUN export PIP_CONSTRAINT=/tmp/constraint.txt && \ RUN export PIP_CONSTRAINT=/tmp/constraint.txt && \
python3 -m pip freeze | grep packaging >> "$PIP_CONSTRAINT" && \ python3 -m pip freeze | grep packaging >> "$PIP_CONSTRAINT" && \
...@@ -254,9 +252,9 @@ RUN export PIP_CONSTRAINT=/tmp/constraint.txt && \ ...@@ -254,9 +252,9 @@ RUN export PIP_CONSTRAINT=/tmp/constraint.txt && \
ziglang \ ziglang \
&& \ && \
unset PIP_CONSTRAINT && \ unset PIP_CONSTRAINT && \
pipx install chalice && \ pipx install --global chalice && \
pipx install curator-opensearch && \ pipx install --global curator-opensearch && \
CFLAGS="-Wno-error=incompatible-pointer-types" pipx install https://github.com/aws/aws-cli/archive/refs/heads/dependabot/pip/v2/ruamel-yaml-clib-0.2.12.zip && \ CFLAGS="-Wno-error=incompatible-pointer-types" pipx install --global https://github.com/aws/aws-cli/archive/refs/heads/dependabot/pip/v2/ruamel-yaml-clib-0.2.12.zip && \
rm -rf /tmp/* /var/tmp/* ~/.cache/* rm -rf /tmp/* /var/tmp/* ~/.cache/*
ENV COREPACK_HOME=/usr/local/share/corepack ENV COREPACK_HOME=/usr/local/share/corepack
# hadolint ignore=DL3016 # hadolint ignore=DL3016
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment