Skip to content

Commit

Permalink
switch to python 3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
tschaume committed Oct 22, 2024
1 parent d73cbd9 commit f759900
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
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.1015.1 AS base
FROM materialsproject/devops:python-3.1110.0 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 All @@ -23,7 +23,7 @@ RUN wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-
-O mpcontribs/api/contributions/formulae.json.gz

FROM base
COPY --from=builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
COPY --from=builder /usr/local/bin /usr/local/bin
COPY --from=builder /usr/lib/x86_64-linux-gnu/libsnappy* /usr/lib/x86_64-linux-gnu/
COPY --from=builder /app/mpcontribs/api /app/mpcontribs/api
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.1015.1 AS base
FROM materialsproject/devops:python-3.1110.0 AS base
RUN apt-get update && apt-get install -y --no-install-recommends libopenblas-dev libpq-dev && 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.10/site-packages /root/.local/lib/python3.10/site-packages
COPY --from=python-deps /root/.local/lib/python3.11/site-packages /root/.local/lib/python3.11/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.1015.1 AS base
FROM materialsproject/devops:python-3.1110.0 AS base
RUN apt-get update && apt-get install -y --no-install-recommends libopenblas-dev && apt-get clean
FROM node:18.18.2-slim AS node

Expand Down Expand Up @@ -34,7 +34,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.10/site-packages /usr/local/lib/python3.10/site-packages
COPY --from=python-deps /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/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 @@ -49,7 +49,7 @@ RUN pip install $PIP_FLAGS $MORE_PIP_FLAGS --no-deps .
RUN python manage.py collectstatic --noinput

FROM base
COPY --from=python-builds /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
COPY --from=python-builds /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/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

0 comments on commit f759900

Please sign in to comment.