fixed generic docker-compose (#361)

Author: acabarbaye

docker-compose.yml

@@ -2,32 +2,29 @@
 # run it with:
 # docker-compose up --exit-code-from testrunner
 
-sdk_test_server: 
-    image: sdk_test_server 
-    #build: . 
-    environment: 
-      - MBED_CLOUD_SDK_API_KEY=abc123
-      - CI=yes
-      - TEST_RUNNER_DEFAULT_API_KEY
-      - TEST_RUNNER_DEFAULT_API_HOST
-    volumes:
-      - ../results:/build/results
-      - ../test_fixtures:/test_fixtures
-      command: [sh, -c, 'source .venv/bin/activate && pytest tests/unit tests/integration']
-testrunner: 
-    #build: tests/mbed-cloud-sdk-testrunner 
-    image: ${TESTRUNNER_DOCKER_IMAGE}
-    environment: 
-      - TEST_SERVER_URL=http://sdk_test_server:5000
-      #folder on test server to get test files from 
-      - TEST_FIXTURES_DIR=/test_fixtures
-      - TEST_RUNNER_SHUTDOWN_SERVER=yes
-      - TEST_RUNNER_DEFAULT_API_KEY
-      - TEST_RUNNER_DEFAULT_API_HOST
-    links: 
-      - sdk_test_server 
-    volumes: 
-      - ../results:/runner/results
-      - ../test_fixtures:/runner/test_fixtures
-    # sleep ensures the testrunner stays up whilst test server completes coverage shutdown
-    command: [sh, -c, '(python -m trunner || true) && sleep 10000']
+sdk_test_server:
+  command:
+    - sh
+    - "-c"
+    - "source .venv/bin/activate && python tests/integration/server.py"
+  environment:
+    - MBED_CLOUD_SDK_API_KEY=abc123
+    - TEST_RUNNER_DEFAULT_API_KEY
+    - TEST_RUNNER_DEFAULT_API_HOST
+  image: sdk_test_server
+  volumes: ["../results:/build/results", "../test_fixtures:/test_fixtures"]
+testrunner:
+  environment:
+    - "TEST_SERVER_URL=http://sdk_test_server:5000"
+    - TEST_FIXTURES_DIR=/test_fixtures
+    - TEST_RUNNER_DEFAULT_API_KEY
+    - TEST_RUNNER_DEFAULT_API_HOST
+  image: "${TESTRUNNER_DOCKER_IMAGE}"
+  command:
+    - sh
+    - "-c"
+    - "sleep 1 && python -m trunner"
+  links:
+    - sdk_test_server
+  volumes: ["../results:/runner/results", "../test_fixtures:/runner/test_fixtures"]
+

docs/news/14062019.misc

@@ -0,0 +1 @@
+Created a generic docker-compose file to run integration tests