Merge 3d94fb5 into 4cca612

ocadotechnology · Sep 5, 2018 · 6544948 · 6544948
2 parents 4cca612 + 3d94fb5
commit 6544948
Show file tree

Hide file tree

Showing 14 changed files with 1,030 additions and 16 deletions.
diff --git a/aimmo-game-creator/Dockerfile b/aimmo-game-creator/Dockerfile
@@ -1,5 +1,11 @@
-FROM python:3-onbuild
+FROM python:2
 
 MAINTAINER code@ocado.com
 
+COPY . .
+
+RUN pip install pipenv
+
+RUN pipenv install --system --deploy
+
 CMD ["python", "./service.py"]
diff --git a/aimmo-game-creator/Pipfile b/aimmo-game-creator/Pipfile
@@ -0,0 +1,11 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+kubernetes = "*"
+aimmo-game-creator = {editable = true, path = "."}
+
+[requires]
+python_version = "2.7"
diff --git a/aimmo-game-creator/Pipfile.lock b/aimmo-game-creator/Pipfile.lock
diff --git a/aimmo-game-creator/requirements.txt b/aimmo-game-creator/requirements.txt
diff --git a/aimmo-game-creator/setup.py b/aimmo-game-creator/setup.py
@@ -8,7 +8,7 @@
     include_package_data=True,
     install_requires=[
         'eventlet',
-        'kubernetes == 5.0.0'
+        'kubernetes >= 6.0.0'
     ],
     tests_require=[
         'httmock',

diff --git a/aimmo-game-worker/Dockerfile b/aimmo-game-worker/Dockerfile
@@ -1,5 +1,11 @@
-FROM python:2-onbuild
+FROM python:2
 
 MAINTAINER code@ocado.com
 
+COPY . .
+
+RUN pip install pipenv
+
+RUN pipenv install --system --deploy
+
 CMD python service.py 0.0.0.0 5000 $DATA_URL
diff --git a/aimmo-game-worker/Pipfile b/aimmo-game-worker/Pipfile
@@ -0,0 +1,11 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+kubernetes = "*"
+aimmo-game-creator = {editable = true, path = "."}
+
+[requires]
+python_version = "2.7"
diff --git a/aimmo-game-worker/Pipfile.lock b/aimmo-game-worker/Pipfile.lock
diff --git a/aimmo-game-worker/requirements.txt b/aimmo-game-worker/requirements.txt
diff --git a/aimmo-game/Dockerfile b/aimmo-game/Dockerfile
@@ -1,7 +1,13 @@
-FROM python:2-onbuild
+FROM python:2
 
 MAINTAINER code@ocado.com
 
 ENV WORKER_MANAGER=kubernetes
 
+COPY . .
+
+RUN pip install pipenv
+
+RUN pipenv install --system --deploy
+
 CMD ["python", "./service.py", "0.0.0.0", "5000"]
diff --git a/aimmo-game/Pipfile b/aimmo-game/Pipfile
@@ -0,0 +1,11 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+kubernetes = "*"
+aimmo-game = {editable = true, path = "."}
+
+[requires]
+python_version = "2.7"