Merge pull request #190 from rackerlabs/common-container

fix: correct issues with the common container
rackerlabs · Aug 2, 2024 · 06c6cef · 06c6cef
2 parents c5613aa + 5893d2a
commit 06c6cef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/containers.yaml b/.github/workflows/containers.yaml
@@ -126,6 +126,10 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ghcr.io/rackerlabs/understack/${{ matrix.container.name }}
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=tag
+            type=ref,event=pr
           labels: |
             org.opencontainers.image.title=${{ matrix.container.title }}
         env:

diff --git a/containers/Dockerfile.ironic-nautobot-client b/containers/Dockerfile.ironic-nautobot-client
@@ -28,6 +28,6 @@ WORKDIR /app
 RUN mkdir -p /opt/venv/wheels/
 COPY --from=builder /app/dist/*.whl /app/dist/requirements.txt /opt/venv/wheels/
 
-RUN --mount=type=cache,target=/root/.cache/.pip /opt/venv/bin/pip install --find-links /opt/venv/wheels/ --only-binary netifaces -r /opt/venv/wheels/requirements.txt
+RUN --mount=type=cache,target=/root/.cache/.pip /opt/venv/bin/pip install --find-links /opt/venv/wheels/ --only-binary netifaces -r /opt/venv/wheels/requirements.txt understack-workflows
 
 USER $APP_USER
diff --git a/python/understack-workflows/understack_workflows/main/sync_nautobot_interfaces.py b/python/understack-workflows/understack_workflows/main/sync_nautobot_interfaces.py
@@ -1,5 +1,4 @@
 import sushy
-from nautobot import Nautobot
 
 from understack_workflows.helpers import arg_parser
 from understack_workflows.helpers import credential
@@ -8,6 +7,7 @@
 from understack_workflows.helpers import oob_sushy_session
 from understack_workflows.helpers import setup_logger
 from understack_workflows.models import Chassis
+from understack_workflows.nautobot import Nautobot
 
 logger = setup_logger(__name__)