Merge pull request #19 from bbc/philipn-update-static-files

Regenerate static files
bbc · Sep 5, 2024 · ffa23ad · ffa23ad
2 parents e7317bf + 5603563
commit ffa23ad
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/static-commontooling/docker/Dockerfile_multi_macros.j2 b/static-commontooling/docker/Dockerfile_multi_macros.j2
@@ -27,6 +27,8 @@ COPY --from=api /api ./{{ modname }}/apidocs
 {% endif -%}
 COPY . .
 
+RUN --mount=type=cache,target=/root/.cache/pip --mount=type=secret,id=pipconf,target=/etc/pip.conf pip install setuptools
+
 RUN python3 setup.py sdist
 {%- endmacro %}
 
@@ -66,6 +68,9 @@ COPY {{ extra_requirements_file }} ./
 RUN cat {{ extra_requirements_file }} >> ./requirements.txt
 {%-  endif %}
 
+# Ensure setuptools is installed
+RUN --mount=type=cache,target=/root/.cache/pip --mount=type=secret,id=pipconf,target=/etc/pip.conf pip install setuptools
+
 {% if install_target != None -%}
 RUN --mount=type=cache,target=/root/.cache/pip --mount=type=secret,id=pipconf,target=/etc/pip.conf mkdir -p {{ install_target }} && pip install -f ./wheels -r requirements.txt -t {{ install_target }}