Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: ensure that compute functions are running as non-root #228

Merged
merged 1 commit into from
Jul 23, 2024
Merged

fix: ensure that compute functions are running as non-root #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changes/228.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Add a non-root user to the generated Dockerfile for the compute functions.

Compute pods were already running as non-root (ensured by a security context in the backend), we are making it more
explicit here.
7 changes: 7 additions & 0 deletions substrafl/remote/register/register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@
# update image
RUN apt update -y

# create a non-root user
RUN addgroup --gid 1001 group
RUN adduser --disabled-password --gecos "" --uid 1001 --gid 1001 --home /home/user user
ENV PYTHONPATH /home/user
WORKDIR /home/user
USER user

# install dependencies
RUN python{python_version} -m pip install -U pip

Expand Down
7 changes: 7 additions & 0 deletions tests/remote/register/test_register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ def test_create_dockerfile(tmp_path, mocker, local_installable_module):
# update image
RUN apt update -y

# create a non-root user
RUN addgroup --gid 1001 group
RUN adduser --disabled-password --gecos "" --uid 1001 --gid 1001 --home /home/user user
ENV PYTHONPATH /home/user
WORKDIR /home/user
USER user

Comment on lines +73 to +79
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we somehow factorize some of this and reuse part of the DOCKERFILE_TEMPLATE?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is part of the test. We are checking that the dockerfile template is what we expect it to be.
Else, we would just be checking that Python f-strings are working as intended, and that should be tested in the standard library :)

Copy link
Contributor

@thbcmlowk thbcmlowk Jul 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant, I think we could avoid updating twice the constant part (where we just run commands that does not depend on anything else) and extract it in a dedicated variable that could be re-injected in the expected result (precisely because we can assume that (f-)strings work as intended) so the test actually focus on the templating part. But no big deal.

# install dependencies
RUN python{python_version} -m pip install -U pip

Expand Down
Loading