Skip to content

Commit

Permalink
minor Dockerfile format
Browse files Browse the repository at this point in the history
  • Loading branch information
tschaume committed Apr 5, 2024
1 parent 29c0e49 commit b9c1f6b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions mpcontribs-api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ RUN pip install $PIP_FLAGS --no-deps .
#COPY flask-mongorest flask-mongorest
#RUN cd flask-mongorest && pip install $PIP_FLAGS --no-deps .
RUN wget -q https://github.com/raw/vishnubob/wait-for-it/master/wait-for-it.sh && \
chmod +x wait-for-it.sh && mv wait-for-it.sh /usr/local/bin/ && \
wget -q https://github.com/materialsproject/MPContribs/blob/master/mpcontribs-api/mpcontribs/api/contributions/formulae.json.gz?raw=true \
-O mpcontribs/api/contributions/formulae.json.gz
chmod +x wait-for-it.sh && mv wait-for-it.sh /usr/local/bin/ && \
wget -q https://github.com/materialsproject/MPContribs/blob/master/mpcontribs-api/mpcontribs/api/contributions/formulae.json.gz?raw=true \
-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
Expand Down
8 changes: 4 additions & 4 deletions mpcontribs-portal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ FROM node:18.18.2-slim as node

FROM node as webpack-deps
RUN apt-get update && apt-get install -y --no-install-recommends \
git curl gnupg ca-certificates apt-transport-https \
&& apt-get clean
git curl gnupg ca-certificates apt-transport-https \
&& apt-get clean
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN apt-get update && apt-get install -y --no-install-recommends yarn
Expand All @@ -29,9 +29,9 @@ ARG MORE_PIP_FLAGS
ENV MORE_PIP_FLAGS=$MORE_PIP_FLAGS
COPY requirements/deployment.txt ./requirements.txt
RUN pip install $PIP_FLAGS $MORE_PIP_FLAGS -r requirements.txt && \
python -m ipykernel install --user
python -m ipykernel install --user
RUN wget -q https://github.com/raw/vishnubob/wait-for-it/master/wait-for-it.sh && \
chmod +x wait-for-it.sh && mv wait-for-it.sh /usr/local/bin/
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
Expand Down

0 comments on commit b9c1f6b

Please sign in to comment.