Skip to content

Commit

Permalink
chore: update setuptools in docker images (#251)
Browse files Browse the repository at this point in the history
Signed-off-by: ThibaultFy <[email protected]>
  • Loading branch information
ThibaultFy authored Oct 2, 2024
1 parent afc3561 commit c860a5c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions changes/250.changed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove parasite verisons of `setuptools` in Dockerfiles and install `setuptools>70.0.0` to tackle last identified CVEs
4 changes: 2 additions & 2 deletions substrafl/remote/register/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
FROM python:{python_version}-slim
# update image
RUN apt-get update -y
RUN apt-get update -y && pip uninstall -y setuptools
"""

_GPU_BASE_IMAGE = """
Expand Down Expand Up @@ -62,7 +62,7 @@
ENV PATH="/home/user/venv/bin:$PATH" VIRTUAL_ENV="/home/user/venv"
# install dependencies
RUN python{python_version} -m pip install -U pip
RUN python{python_version} -m pip install -U pip && pip install -U setuptools>=70.0.0
# Copy local wheels
{copy_wheels}
Expand Down
6 changes: 3 additions & 3 deletions tests/remote/register/test_register.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test_get_base_docker_image_cpu():
FROM python:3.12-slim
# update image
RUN apt-get update -y
RUN apt-get update -y && pip uninstall -y setuptools
"""
assert expected_dockerfile == _get_base_docker_image("3.12", use_gpu=False)

Expand Down Expand Up @@ -97,7 +97,7 @@ def test_create_dockerfile(tmp_path, local_installable_module):
FROM python:{python_version}-slim
# update image
RUN apt-get update -y
RUN apt-get update -y && pip uninstall -y setuptools
# create a non-root user
RUN addgroup --gid 1001 group
Expand All @@ -109,7 +109,7 @@ def test_create_dockerfile(tmp_path, local_installable_module):
ENV PATH="/home/user/venv/bin:$PATH" VIRTUAL_ENV="/home/user/venv"
# install dependencies
RUN python{python_version} -m pip install -U pip
RUN python{python_version} -m pip install -U pip && pip install -U setuptools>=70.0.0
# Copy local wheels
COPY {substrafl_wheel} {substrafl_wheel}
Expand Down

0 comments on commit c860a5c

Please sign in to comment.