Skip to content

Commit

Permalink
Merge branch 'master' into firehose-ris
Browse files Browse the repository at this point in the history
  • Loading branch information
slowr committed Mar 13, 2019
2 parents 5a37108 + 6b05f5b commit 1815b06
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion backend/testing/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jfloff/alpine-python:3.6
FROM mavromat/alpine-python:3.6

LABEL maintainer="Dimitrios Mavrommatis <jim.mavrommatis@gmail.com>"

Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPY ./minify-js.sh /root/
RUN mkdir /root/prod/
RUN ./minify-js.sh

FROM jfloff/alpine-python:3.6
FROM mavromat/alpine-python:3.6

WORKDIR /root

Expand Down

0 comments on commit 1815b06

Please sign in to comment.