Merge 2f274f6 into 45a966e

.travis.yml

@@ -33,6 +33,10 @@ jobs:
         - minikube update-context
         # Wait for Kubernetes to be up and ready.
         - JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
+      addons:
+        apt:
+          packages:
+            - docker-ce
       before_install:
         - nvm install node
         - nvm use node
@@ -49,36 +53,52 @@ jobs:
       after_success:
         - coveralls
     - name: "aimmo-game"
+      addons:
+        apt:
+          packages:
+            - docker-ce
       before_install:
         - cd aimmo-game
-        - docker build -t ocadotechnology/aimmo-game:test .
+        - docker build --target tester -t ocadotechnology/aimmo-game:test .
       install:
         - pip install coveralls
       script:
         - docker run -it -p 5000:5000 ocadotechnology/aimmo-game:test
       after_success:
         - coveralls
     - name: "aimmo-game-creator"
+      addons:
+        apt:
+          packages:
+            - docker-ce
       before_install:
         - cd aimmo-game-creator
-        - docker build -t  ocadotechnology/aimmo-game-creator:test .
+        - docker build --target tester -t  ocadotechnology/aimmo-game-creator:test .
       install:
         - pip install coveralls
       script:
         - docker run -it -p 5000:5000 ocadotechnology/aimmo-game-creator:test
       after_success:
         - coveralls
     - name: "aimmo-game-worker"
+      addons:
+        apt:
+          packages:
+            - docker-ce
       before_install:
         - cd aimmo-game-worker
-        - docker build -t ocadotechnology/aimmo-game-worker:test .
+        - docker build --target tester -t ocadotechnology/aimmo-game-worker:test .
       install:
         - pip install coveralls
       script:
         - docker run -it -p 5000:5000 ocadotechnology/aimmo-game-worker:test
       after_success:
         - coveralls
     - name: "Javascript Tests"
+      addons:
+        apt:
+          packages:
+            - docker-ce
       before_install:
         - nvm install node
         - nvm use node
@@ -111,6 +131,10 @@ jobs:
     - stage: deploy
       env:
         - NODE_ENV=production
+      addons:
+        apt:
+          packages:
+            - docker-ce
       before_install:
         - nvm install node
         - nvm use node

aimmo-game-creator/Dockerfile

@@ -3,26 +3,16 @@ MAINTAINER code@ocado.com
 # RUN apk add --no-cache gcc musl-dev python-dev libffi-dev openssl-dev
 RUN pip install pipenv
 COPY ["Pipfile", "Pipfile.lock", "setup.py", "./"]
-RUN pipenv install coverage
 RUN pipenv install --system --deploy
 
 FROM python:3.6-alpine as base
 COPY --from=builder /usr/local/lib/python3.6/site-packages /usr/local/lib/python3.6/site-packages
 COPY . .
 
-
 FROM base as runner
 ENV WORKER_MANAGER=kubernetes
 CMD ["python", "./service.py", "0.0.0.0"]
 
-
 FROM base as tester
 ENV WORKER_MANAGER=kubernetes
 CMD ["python", "setup.py", "test"]
-
-FROM base as coverage_tester
-ENV WORKER_MANAGER=kubernetes
-ENV WITH_COVERAGE='True'
-RUN apk add bash
-COPY --from=builder /usr/local/bin/coverage /usr/local/bin/coverage
-CMD python setup.py test

aimmo-game-creator/Pipfile

@@ -7,7 +7,6 @@ name = "pypi"
 kubernetes = "*"
 aimmo-game-creator = {editable = true, path = "."}
 docker = "*"
-coverage = "*"
 
 [requires]
 python_version = "3.6.7"

aimmo-game-creator/hooks/build

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --target runner -t $IMAGE_NAME .

aimmo-game-creator/setup.py

@@ -1,19 +1,11 @@
 # -*- coding: utf-8 -*-
 from setuptools import find_packages, setup
-import coverage
 import sys
 import os
 
 
 withcoverage = os.environ.get('WITH_COVERAGE')
 
-if withcoverage == 'True':
-    print("starting code coverage engine")
-    coveragedatafile = ".coverage"
-    cov = coverage.Coverage(config_file=False)
-    cov.start()
-
-
 setup(
     name='aimmo-game-creator',
     packages=find_packages(),
@@ -28,8 +20,3 @@
     test_suite='tests',
     zip_safe=False,
 )
-
-if withcoverage == 'True':
-    print("saving coverage stats")
-    cov.save()
-    print("exiting program")

aimmo-game-worker/Dockerfile

@@ -3,7 +3,6 @@ MAINTAINER code@ocado.com
 
 RUN pip install pipenv
 COPY ["Pipfile", "Pipfile.lock", "setup.py", "./"]
-RUN pipenv install coverage
 RUN pipenv install --system --deploy
 
 FROM python:3.6-alpine as base
@@ -13,16 +12,8 @@ COPY . .
 FROM base as runner
 ENV WORKER_MANAGER=kubernetes
 ENV FLASK_ENV='development'
-RUN apk add --no-cache bash
 CMD python ./service.py 0.0.0.0 $PORT $DATA_URL
 
 FROM base as tester
 ENV WORKER_MANAGER=kubernetes
 CMD python setup.py test
-
-FROM base as coverage_tester
-ENV WORKER_MANAGER=kubernetes
-ENV WITH_COVERAGE='True'
-RUN apk add bash
-COPY --from=builder /usr/local/bin/coverage /usr/local/bin/coverage
-CMD python setup.py test

aimmo-game-worker/hooks/build

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --target runner -t $IMAGE_NAME .

aimmo-game-worker/setup.py

@@ -1,18 +1,11 @@
 # -*- coding: utf-8 -*-
 from setuptools import find_packages, setup
-import coverage
 import sys
 import os
 
 
 withcoverage = os.environ.get('WITH_COVERAGE')
 
-if withcoverage == 'True':
-    print("starting code coverage engine")
-    coveragedatafile = ".coverage"
-    cov = coverage.Coverage(config_file=False)
-    cov.start()
-
 setup(
     name='aimmo-game-worker',
     packages=find_packages(),
@@ -28,8 +21,3 @@
     test_suite='tests',
     zip_safe=False,
 )
-
-if withcoverage == 'True':
-    print("saving coverage stats")
-    cov.save()
-    print("exiting program")

aimmo-game/Dockerfile

@@ -1,27 +1,17 @@
 FROM python:3.6 as builder
 MAINTAINER code@ocado.com
-
 RUN pip install pipenv
 COPY ["Pipfile", "Pipfile.lock", "setup.py", "./"]
-RUN pipenv install coverage
 RUN pipenv install --system --deploy
 
 FROM python:3.6-alpine as base
 COPY --from=builder /usr/local/lib/python3.6/site-packages /usr/local/lib/python3.6/site-packages
 COPY . .
 
-FROM base as runner
-RUN apk add --no-cache bash
-ENV WORKER_MANAGER=kubernetes
-CMD python ./service.py 0.0.0.0
-
 FROM base as tester
 ENV WORKER_MANAGER=kubernetes
 CMD python setup.py test
 
-FROM base as coverage_tester
+FROM base as runner
 ENV WORKER_MANAGER=kubernetes
-ENV WITH_COVERAGE='True'
-RUN apk add bash
-COPY --from=builder /usr/local/bin/coverage /usr/local/bin/coverage
-CMD python setup.py test
+CMD python ./service.py 0.0.0.0 5000

aimmo-game/Pipfile

@@ -4,13 +4,12 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-aimmo-game = {path = ".", editable = true}
+aimmo-game = {editable = true, path = "."}
 docker = "*"
 kubernetes = "*"
 prometheus-client = "*"
 aiohttp = "*"
 aiohttp-cors = "*"
-coverage = "*"
 
 [requires]
 python_version = "3.6.7"