From e3a86a7d7074731e07ad798c87006813ccf6d185 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 14 Dec 2023 09:11:16 +0100 Subject: [PATCH] chore: use pipx to isolate python packages --- Containerfile.multiarch | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Containerfile.multiarch b/Containerfile.multiarch index 9c11afe..63b8a8f 100644 --- a/Containerfile.multiarch +++ b/Containerfile.multiarch @@ -33,9 +33,14 @@ ENV POLARIS_VERSION="${POLARIS_VERSION:-8.5.3}" # renovate: datasource=pypi depName=flux-local ENV FLUX_LOCAL_VERSION="${FLUX_LOCAL_VERSION:-3.2.0}" -RUN apk --update add curl tar bash python3 py3-yaml py3-pip findutils git && \ +ENV PIPX_HOME=/opt/pipx +ENV PIPX_BIN_DIR=/usr/local/bin + +RUN apk --update add curl tar bash python3 pipx findutils git && \ apk --no-cache upgrade libcrypto3 libssl3 && \ - pip install -qq --no-cache-dir flux-local=="$FLUX_LOCAL_VERSION" && \ + pipx install --include-deps flux-local=="$FLUX_LOCAL_VERSION" && \ + pipx inject flux-local PyYAML && \ + $PIPX_HOME/shared/bin/pip install -U pip setuptools && \ curl -SsfL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${TARGETOS}/${TARGETARCH}/kubectl" && \ curl -SsfL -o /usr/local/bin/kubectl-convert "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${TARGETOS}/${TARGETARCH}/kubectl-convert" && \ curl -SsfL -o /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_${TARGETOS}_${TARGETARCH}" && \