Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions mpcontribs-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM materialsproject/devops:python-3.1113.18 AS base
FROM materialsproject/devops:python-3.1213.2 AS base
RUN apt-get update && apt-get install -y --no-install-recommends supervisor libopenblas-dev libpq-dev vim && apt-get clean
WORKDIR /app

Expand Down Expand Up @@ -28,7 +28,7 @@ RUN wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-
FROM base
ARG BUILDARCH
ENV BUILDARCH=x86_64
COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
COPY --from=builder /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
COPY --from=builder /usr/local/bin /usr/local/bin
COPY --from=builder /usr/lib/$BUILDARCH-linux-gnu/libsnappy* /usr/lib/$BUILDARCH-linux-gnu/

Expand Down
4 changes: 2 additions & 2 deletions mpcontribs-kernel-gateway/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM materialsproject/devops:python-3.1113.18 AS base
FROM materialsproject/devops:python-3.1213.2 AS base
RUN apt-get update && apt-get install -y --no-install-recommends libopenblas-dev libpq-dev curl && apt-get clean

FROM base AS python-deps
Expand All @@ -14,7 +14,7 @@ RUN wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-
chmod +x wait-for-it.sh && mv wait-for-it.sh /root/.local/bin/

FROM base
COPY --from=python-deps /root/.local/lib/python3.11/site-packages /root/.local/lib/python3.11/site-packages
COPY --from=python-deps /root/.local/lib/python3.12/site-packages /root/.local/lib/python3.12/site-packages
COPY --from=python-deps /root/.local/bin /root/.local/bin

WORKDIR /app
Expand Down
6 changes: 3 additions & 3 deletions mpcontribs-portal/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM materialsproject/devops:python-3.1113.18 AS base
FROM materialsproject/devops:python-3.1213.2 AS base
RUN apt-get update && apt-get install -y --no-install-recommends libopenblas-dev && apt-get clean
FROM node:26.4.0-slim AS node

Expand Down Expand Up @@ -32,7 +32,7 @@ RUN wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-
chmod +x wait-for-it.sh && mv wait-for-it.sh /usr/local/bin/

FROM base AS python-builds
COPY --from=python-deps /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
COPY --from=python-deps /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
COPY --from=python-deps /usr/local/bin /usr/local/bin
COPY --from=python-deps /usr/local/share /usr/local/share
WORKDIR /app
Expand All @@ -48,7 +48,7 @@ RUN SETUPTOOLS_SCM_PRETEND_VERSION=${CONTRIBS_VERSION} pip install $PIP_FLAGS $M
RUN python manage.py collectstatic --noinput

FROM base
COPY --from=python-builds /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
COPY --from=python-builds /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
COPY --from=python-builds /usr/local/bin /usr/local/bin
COPY --from=python-builds /usr/local/share /usr/local/share
COPY --from=python-builds /app/static /app/static
Expand Down
Loading