Refactor tests to use env vars, Travis matrix, and push dated tags

.travis.yml

@@ -11,11 +11,24 @@ install:
 services:
   - docker
 
+env:
+  - NAME='latest' BUILD_PATH='python3.7' TEST_STR1='Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn (default)' TEST_STR2='Test app. From Meinheld with Gunicorn. Using Python 3.7'
+  - NAME='python3.7' BUILD_PATH='python3.7' TEST_STR1='Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn (default)' TEST_STR2='Test app. From Meinheld with Gunicorn. Using Python 3.7'
+  - NAME='python3.6' BUILD_PATH='python3.6' TEST_STR1='Hello World from a default Python 3.6 app in a Docker container, with Meinheld and Gunicorn (default)' TEST_STR2='Test app. From Meinheld with Gunicorn. Using Python 3.6'
+  - NAME='python2.7' BUILD_PATH='python2.7' TEST_STR1='Hello World from a default Python 2.7 app in a Docker container, with Meinheld and Gunicorn (default)' TEST_STR2='Test app. From Meinheld with Gunicorn. Using Python 2.7'
+  - NAME='python3.7-alpine3.8' BUILD_PATH='python3.7-alpine3.8' TEST_STR1='Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn on Alpine (default)' TEST_STR2='Test app. From Meinheld with Gunicorn. Using Python 3.7'
+  - NAME='python3.6-alpine3.8' BUILD_PATH='python3.6-alpine3.8' TEST_STR1='Hello World from a default Python 3.6 app in a Docker container, with Meinheld and Gunicorn on Alpine (default)' TEST_STR2='Test app. From Meinheld with Gunicorn. Using Python 3.6'
+
 script:
   - bash scripts/test.sh
 
-deploy:
-  provider: script
-  script: bash scripts/build-push.sh
-  on:
-    branch: master
+jobs:
+    include:
+      - script: bash scripts/test.sh
+      - stage: deploy
+        script: skip
+        deploy:
+          provider: script
+          script: bash scripts/build-push-all.sh
+          on:
+            branch: master

scripts/build-push-all.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+
+BUILD_PUSH=1 python scripts/process_all.py

scripts/build-push.sh

@@ -2,8 +2,12 @@
 
 set -e
 
-echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+use_tag="tiangolo/meinheld-gunicorn:$NAME"
+use_dated_tag="${use_tag}-$(date -I)"
 
-docker-compose -f docker-compose.build.yml build
+docker build -t "$use_tag" "$BUILD_PATH"
 
-docker-compose -f docker-compose.build.yml push
+docker tag "$use_tag" "$use_dated_tag"
+
+docker push "$use_tag"
+docker push "$use_dated_tag"

scripts/process_all.py

@@ -0,0 +1,84 @@
+import os
+import subprocess
+import sys
+
+environments = [
+    {
+        "NAME": "latest",
+        "BUILD_PATH": "python3.7",
+        "TEST_STR1": "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn (default)",
+        "TEST_STR2": "Test app. From Meinheld with Gunicorn. Using Python 3.7",
+    },
+    {
+        "NAME": "python3.7",
+        "BUILD_PATH": "python3.7",
+        "TEST_STR1": "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn (default)",
+        "TEST_STR2": "Test app. From Meinheld with Gunicorn. Using Python 3.7",
+    },
+    {
+        "NAME": "python3.6",
+        "BUILD_PATH": "python3.6",
+        "TEST_STR1": "Hello World from a default Python 3.6 app in a Docker container, with Meinheld and Gunicorn (default)",
+        "TEST_STR2": "Test app. From Meinheld with Gunicorn. Using Python 3.6",
+    },
+    {
+        "NAME": "python2.7",
+        "BUILD_PATH": "python2.7",
+        "TEST_STR1": "Hello World from a default Python 2.7 app in a Docker container, with Meinheld and Gunicorn (default)",
+        "TEST_STR2": "Test app. From Meinheld with Gunicorn. Using Python 2.7",
+    },
+    {
+        "NAME": "python3.7-alpine3.8",
+        "BUILD_PATH": "python3.7-alpine3.8",
+        "TEST_STR1": "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn on Alpine (default)",
+        "TEST_STR2": "Test app. From Meinheld with Gunicorn. Using Python 3.7",
+    },
+    {
+        "NAME": "python3.6-alpine3.8",
+        "BUILD_PATH": "python3.6-alpine3.8",
+        "TEST_STR1": "Hello World from a default Python 3.6 app in a Docker container, with Meinheld and Gunicorn on Alpine (default)",
+        "TEST_STR2": "Test app. From Meinheld with Gunicorn. Using Python 3.6",
+    },
+]
+
+start_with = os.environ.get("START_WITH")
+build_push = os.environ.get("BUILD_PUSH")
+
+
+def process_tag(*, env: dict):
+    use_env = {**os.environ, **env}
+    script = "scripts/test.sh"
+    if build_push:
+        script = "scripts/build-push.sh"
+    return_code = subprocess.call(["bash", script], env=use_env)
+    if return_code != 0:
+        sys.exit(return_code)
+
+
+def print_version_envs():
+    env_lines = []
+    for env in environments:
+        env_vars = []
+        for key, value in env.items():
+            env_vars.append(f"{key}='{value}'")
+        env_lines.append(" ".join(env_vars))
+    for line in env_lines:
+        print(line)
+
+
+def main():
+    start_at = 0
+    if start_with:
+        start_at = [
+            i for i, env in enumerate((environments)) if env["NAME"] == start_with
+        ][0]
+    for i, env in enumerate(environments[start_at:]):
+        print(f"Processing tag: {env['NAME']}")
+        process_tag(env=env)
+
+
+if __name__ == "__main__":
+    if len(sys.argv) > 1:
+        print_version_envs()
+    else:
+        main()

scripts/test-all.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -e
+
+python scripts/process_all.py

scripts/test.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-docker-compose -f docker-compose.build.yml build
+use_tag="tiangolo/meinheld-gunicorn:$NAME"
+
+docker build -t "$use_tag" "$BUILD_PATH"
 pytest tests

tests/test_01_main/test_defaults.py

@@ -1,3 +1,4 @@
+import os
 import time
 
 import docker
@@ -27,46 +28,21 @@ def verify_container(container, response_text):
     assert response.text == response_text
 
 
-@pytest.mark.parametrize(
-    "image,response_text",
-    [
-        (
-            "tiangolo/meinheld-gunicorn:python2.7",
-            "Hello World from a default Python 2.7 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.6",
-            "Hello World from a default Python 3.6 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.6-alpine3.8",
-            "Hello World from a default Python 3.6 app in a Docker container, with Meinheld and Gunicorn on Alpine (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.7",
-            "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.7-alpine3.8",
-            "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn on Alpine (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:latest",
-            "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-    ],
-)
-def test_defaults(image, response_text):
+def test_defaults():
+    name = os.getenv("NAME")
+    image = f"tiangolo/meinheld-gunicorn:{name}"
+    response_text = os.getenv("TEST_STR1")
+    sleep_time = int(os.getenv("SLEEP_TIME", 1))
     remove_previous_container(client)
     container = client.containers.run(
         image, name=CONTAINER_NAME, ports={"80": "8000"}, detach=True
     )
-    time.sleep(1)
+    time.sleep(sleep_time)
     verify_container(container, response_text)
     container.stop()
     # Test that everything works after restarting too
     container.start()
-    time.sleep(1)
+    time.sleep(sleep_time)
     verify_container(container, response_text)
     container.stop()
     container.remove()

tests/test_01_main/test_env_vars_1.py

@@ -1,3 +1,4 @@
+import os
 import time
 
 import docker
@@ -26,36 +27,11 @@ def verify_container(container, response_text):
     assert response.text == response_text
 
 
-@pytest.mark.parametrize(
-    "image,response_text",
-    [
-        (
-            "tiangolo/meinheld-gunicorn:python2.7",
-            "Hello World from a default Python 2.7 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.6",
-            "Hello World from a default Python 3.6 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.6-alpine3.8",
-            "Hello World from a default Python 3.6 app in a Docker container, with Meinheld and Gunicorn on Alpine (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.7",
-            "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.7-alpine3.8",
-            "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn on Alpine (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:latest",
-            "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-    ],
-)
-def test_env_vars_1(image, response_text):
+def test_env_vars_1():
+    name = os.getenv("NAME")
+    image = f"tiangolo/meinheld-gunicorn:{name}"
+    response_text = os.getenv("TEST_STR1")
+    sleep_time = int(os.getenv("SLEEP_TIME", 1))
     remove_previous_container(client)
     container = client.containers.run(
         image,
@@ -64,12 +40,12 @@ def test_env_vars_1(image, response_text):
         ports={"8000": "8000"},
         detach=True,
     )
-    time.sleep(1)
+    time.sleep(sleep_time)
     verify_container(container, response_text)
     container.stop()
     # Test that everything works after restarting too
     container.start()
-    time.sleep(1)
+    time.sleep(sleep_time)
     verify_container(container, response_text)
     container.stop()
     container.remove()

tests/test_01_main/test_env_vars_2.py

@@ -1,3 +1,4 @@
+import os
 import time
 
 import docker
@@ -31,18 +32,10 @@ def verify_container(container):
     )
 
 
-@pytest.mark.parametrize(
-    "image",
-    [
-        ("tiangolo/meinheld-gunicorn:python2.7"),
-        ("tiangolo/meinheld-gunicorn:python3.6"),
-        ("tiangolo/meinheld-gunicorn:python3.7"),
-        ("tiangolo/meinheld-gunicorn:latest"),
-        ("tiangolo/meinheld-gunicorn:python3.6-alpine3.8"),
-        ("tiangolo/meinheld-gunicorn:python3.7-alpine3.8"),
-    ],
-)
-def test_env_vars_2(image):
+def test_env_vars_2():
+    name = os.getenv("NAME")
+    image = f"tiangolo/meinheld-gunicorn:{name}"
+    sleep_time = int(os.getenv("SLEEP_TIME", 1))
     remove_previous_container(client)
     container = client.containers.run(
         image,
@@ -51,12 +44,12 @@ def test_env_vars_2(image):
         ports={"80": "8000"},
         detach=True,
     )
-    time.sleep(1)
+    time.sleep(sleep_time)
     verify_container(container)
     container.stop()
     # Test that everything works after restarting too
     container.start()
-    time.sleep(1)
+    time.sleep(sleep_time)
     verify_container(container)
     container.stop()
     container.remove()

tests/test_01_main/test_env_vars_3.py

@@ -1,3 +1,4 @@
+import os
 import time
 
 import docker
@@ -24,36 +25,11 @@ def verify_container(container, response_text):
     assert response.text == response_text
 
 
-@pytest.mark.parametrize(
-    "image,response_text",
-    [
-        (
-            "tiangolo/meinheld-gunicorn:python2.7",
-            "Hello World from a default Python 2.7 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.6",
-            "Hello World from a default Python 3.6 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.6-alpine3.8",
-            "Hello World from a default Python 3.6 app in a Docker container, with Meinheld and Gunicorn on Alpine (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.7",
-            "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:python3.7-alpine3.8",
-            "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn on Alpine (default)",
-        ),
-        (
-            "tiangolo/meinheld-gunicorn:latest",
-            "Hello World from a default Python 3.7 app in a Docker container, with Meinheld and Gunicorn (default)",
-        ),
-    ],
-)
-def test_env_bind(image, response_text):
+def test_env_bind():
+    name = os.getenv("NAME")
+    image = f"tiangolo/meinheld-gunicorn:{name}"
+    response_text = os.getenv("TEST_STR1")
+    sleep_time = int(os.getenv("SLEEP_TIME", 1))
     remove_previous_container(client)
     container = client.containers.run(
         image,
@@ -62,12 +38,12 @@ def test_env_bind(image, response_text):
         ports={"8080": "8000"},
         detach=True,
     )
-    time.sleep(1)
+    time.sleep(sleep_time)
     verify_container(container, response_text)
     container.stop()
     # Test that everything works after restarting too
     container.start()
-    time.sleep(1)
+    time.sleep(sleep_time)
     verify_container(container, response_text)
     container.stop()
     container.remove()