-
Notifications
You must be signed in to change notification settings - Fork 12
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.
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
Fix advisory inheritance and overrides #148
base: master
Are you sure you want to change the base?
Conversation
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Let's try and get /hold |
7e9c594
to
836eabb
Compare
I switched back to using |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you try this?
|
||
#Setup uv package manager | ||
RUN curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="/home/$USERNAME/.local" sh \ | ||
&& uv venv --python 3.11 ../.venv |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#Setup uv package manager | |
RUN curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="/home/$USERNAME/.local" sh \ | |
&& uv venv --python 3.11 ../.venv | |
# Setup uv package manager | |
RUN pip3 install uv && uv venv --python 3.11 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When installing uv
with pip, uv self update
is disabled and it has to be updated with pip
. I wanted to avoid having to update pip
just so we can us it to update uv
but not really sure if my thinking there is correct. What do you think?
As for installing the virtual environment in workspaces/.venv
instead of workspaces/art-dash/.venv
- I did it this way because in the art-dashboard-server README, the recommended podman run ...
command also includes
-v "$OPENSHIFT/art-dashboard-server":/workspaces/art-dash:cached
which causes the users art-dashboard-server
to be mounted over our workspaces/art-dash/
- and with it, the .venv
we setup while building the container as well (it wouldn't be accessible)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updating inside a container is not so much of a concern. Just rebuild the image and get the newest.
Fixes the following:
advisories!
defined, art-dash would use theadvisories
defined in the basis version (it would also not retrieve the corresponding jira ticket)current_advisories
andbasis_advisories
(orbasis_override_advisories
), art-dash would layerbasis_advisories
(orbasis_override_advisories
) overcurrent_advisories
. Now it is the opposite.Also temporarily replaceThis is now fixed./install.sh
in the Dockerfiles withpip3 install -e artcommon/ -e doozer/ -e elliott/ -e pyartcd/
because./install.sh
is now usinguv
package manager and so far I couldn't get it to work inside the Dockerfiles.