Merge pull request #695 from rackerlabs/fix-psutil-ironic-nautobot-client

fix: psutil in ironic nautobot client AND pip cache dir

Author: skrobul

containers/ironic-nautobot-client/Dockerfile.ironic-nautobot-client

@@ -2,8 +2,8 @@ ARG BASE=ghcr.io/rackerlabs/understack/python3.11.8-alpine3.19:latest
 FROM ${BASE} AS builder
 
 RUN --mount=type=cache,target=/var/cache/apk apk add --virtual build-deps gcc python3-dev musl-dev linux-headers
-RUN --mount=type=cache,target=/root/.cache/.pip pip install 'wheel==0.43.0'
-RUN --mount=type=cache,target=/root/.cache/.pip \
+RUN --mount=type=cache,target=/root/.cache/pip pip install 'wheel==0.43.0'
+RUN --mount=type=cache,target=/root/.cache/pip \
     python -m venv /opt/poetry && \
     /opt/poetry/bin/pip install 'poetry==1.7.1' && \
     /opt/poetry/bin/poetry self add 'poetry-dynamic-versioning[plugin]==1.3.0'
@@ -12,7 +12,7 @@ RUN --mount=type=cache,target=/root/.cache/.pip \
 COPY --chown=appuser:appgroup python/understack-workflows /app
 COPY --chown=appuser:appgroup python/understack-flavor-matcher /understack-flavor-matcher
 # need netifaces built as a wheel
-RUN --mount=type=cache,target=/root/.cache/.pip pip wheel --wheel-dir /app/dist netifaces psutil
+RUN --mount=type=cache,target=/root/.cache/pip pip wheel --wheel-dir /app/dist netifaces psutil==6.1.1
 # build wheels and requirements.txt, skip hashes due to building of netifaces above which won't match
 RUN cd /app && /opt/poetry/bin/poetry build -f wheel && /opt/poetry/bin/poetry export --without-hashes -f requirements.txt -o dist/requirements.txt
 
@@ -24,6 +24,6 @@ RUN mkdir -p /opt/venv/wheels/
 COPY --from=builder /app/dist/*.whl /app/dist/requirements.txt /opt/venv/wheels/
 COPY --chown=appuser:appgroup python/understack-flavor-matcher /understack-flavor-matcher
 
-RUN --mount=type=cache,target=/root/.cache/.pip /opt/venv/bin/pip install --find-links /opt/venv/wheels/ --only-binary netifaces psutil -r /opt/venv/wheels/requirements.txt understack-workflows
+RUN --mount=type=cache,target=/root/.cache/pip /opt/venv/bin/pip install --find-links /opt/venv/wheels/ --only-binary netifaces psutil -r /opt/venv/wheels/requirements.txt understack-workflows
 
 USER appuser

containers/python311_alpine/Dockerfile.python311_alpine

@@ -26,7 +26,7 @@ CMD ["python", "-"]
 # FROM ghcr.io/rackerlabs/understack/python3.11.8-alpine3.19
 #
 # RUN --mount=type=cache,target=/var/cache/apk apk add --virtual build-deps gcc python3-dev musl-dev linux-headers
-# RUN --mount=type=cache,target=/root/.cache/.pip pip install --no-cache-dir python-ironicclient==5.4.0
+# RUN --mount=type=cache,target=/root/.cache/pip pip install --no-cache-dir python-ironicclient==5.4.0
 #
 # FROM ghcr.io/rackerlabs/understack/python3.11.8-alpine3.19 as prod
 # ENV PATH="/opt/venv/bin:$PATH"

containers/python312_alpine/Dockerfile.python312_alpine

@@ -26,7 +26,7 @@ CMD ["python", "-"]
 # FROM ghcr.io/rackerlabs/understack/python3.12.2-alpine3.19
 #
 # RUN --mount=type=cache,target=/var/cache/apk apk add --virtual build-deps gcc python3-dev musl-dev linux-headers
-# RUN --mount=type=cache,target=/root/.cache/.pip pip install --no-cache-dir python-ironicclient==5.4.0
+# RUN --mount=type=cache,target=/root/.cache/pip pip install --no-cache-dir python-ironicclient==5.4.0
 #
 # FROM ghcr.io/rackerlabs/understack/python3.12.2-alpine3.19 as prod
 # ENV PATH="/opt/venv/bin:$PATH"