Skip to content

Commit

Permalink
Merge branch 'development' into stop_turn_slowdown
Browse files Browse the repository at this point in the history
  • Loading branch information
TheseusGrey committed Oct 17, 2018
2 parents d0563a2 + 6488e91 commit 67dff54
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion aimmo-game-creator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
FROM python:2
FROM python:2-alpine

MAINTAINER code@ocado.com

COPY . .

RUN apk add --no-cache gcc musl-dev python-dev libffi-dev openssl-dev

RUN pip install pipenv

RUN pipenv install --system --deploy
Expand Down
4 changes: 3 additions & 1 deletion aimmo-game-worker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
FROM python:2
FROM python:2-alpine

MAINTAINER code@ocado.com

COPY . .

RUN apk add --no-cache gcc musl-dev python-dev libffi-dev openssl-dev

RUN pip install pipenv

RUN pipenv install --system --deploy
Expand Down
4 changes: 3 additions & 1 deletion aimmo-game/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
FROM python:2
FROM python:2-alpine

MAINTAINER code@ocado.com

ENV WORKER_MANAGER=kubernetes

COPY . .

RUN apk add --no-cache gcc musl-dev python-dev libffi-dev openssl-dev

RUN pip install pipenv

RUN pipenv install --system --deploy
Expand Down

0 comments on commit 67dff54

Please sign in to comment.