From bc658e99adce8b613496eb22ce4036386fc50464 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Thu, 16 Apr 2020 20:44:21 +0200
Subject: [PATCH 1/4] fix docker smoke test

---
 release/cibuild.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/release/cibuild.py b/release/cibuild.py
index 85a003f50..bbfb4984b 100755
--- a/release/cibuild.py
+++ b/release/cibuild.py
@@ -361,8 +361,9 @@ def build_docker_image(be: BuildEnviron):  # pragma: no cover
         "docker",
         "run",
         "--rm",
-        "--it",
-        "mitmproxy/mitmproxy:" + be.docker_tag,
+        "-i",
+        "-t",
+        be.docker_tag,
         "mitmproxy",
         "--version",
     ], check=True)

From f78d781283802895a6af9c056e1c3e52fe4af7e9 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 17 Apr 2020 00:04:17 +0200
Subject: [PATCH 2/4] mitmproxy -> mitmdump

---
 release/cibuild.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/cibuild.py b/release/cibuild.py
index bbfb4984b..9ff95554a 100755
--- a/release/cibuild.py
+++ b/release/cibuild.py
@@ -364,7 +364,7 @@ def build_docker_image(be: BuildEnviron):  # pragma: no cover
         "-i",
         "-t",
         be.docker_tag,
-        "mitmproxy",
+        "mitmdump",
         "--version",
     ], check=True)
     assert "Mitmproxy: " + be.version in r.stdout.decode()

From 24a14a7d68487d353ec71d84ff10874a8dd6963a Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 17 Apr 2020 14:24:45 +0200
Subject: [PATCH 3/4] cibuild: docker run must be non-interactive

---
 release/cibuild.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/release/cibuild.py b/release/cibuild.py
index 9ff95554a..ff8e2c283 100755
--- a/release/cibuild.py
+++ b/release/cibuild.py
@@ -361,8 +361,6 @@ def build_docker_image(be: BuildEnviron):  # pragma: no cover
         "docker",
         "run",
         "--rm",
-        "-i",
-        "-t",
         be.docker_tag,
         "mitmdump",
         "--version",

From 96f1f4b1356b6a789dcc4cd7def2d4b8746a790e Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Fri, 17 Apr 2020 17:46:11 +0200
Subject: [PATCH 4/4] fix the fix

---
 release/cibuild.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/release/cibuild.py b/release/cibuild.py
index ff8e2c283..b00bdb5c7 100755
--- a/release/cibuild.py
+++ b/release/cibuild.py
@@ -364,11 +364,9 @@ def build_docker_image(be: BuildEnviron):  # pragma: no cover
         be.docker_tag,
         "mitmdump",
         "--version",
-    ], check=True)
-    assert "Mitmproxy: " + be.version in r.stdout.decode()
-    assert "Python: " in r.stdout.decode()
-    assert "OpenSSL: " in r.stdout.decode()
-    assert "Platform: " in r.stdout.decode()
+    ], check=True, capture_output=True)
+    print(r.stdout.decode())
+    assert "Mitmproxy: " in r.stdout.decode()
 
 
 def build_pyinstaller(be: BuildEnviron):  # pragma: no cover