diff options
Diffstat (limited to 'release/cibuild.py')
| -rwxr-xr-x | release/cibuild.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/release/cibuild.py b/release/cibuild.py index d070a4b9..b00bdb5c 100755 --- a/release/cibuild.py +++ b/release/cibuild.py @@ -356,15 +356,17 @@ def build_docker_image(be: BuildEnviron): # pragma: no cover "--file", "release/docker/Dockerfile", "." ]) - subprocess.check_call([ + # smoke-test the newly built docker image + r = subprocess.run([ "docker", - "build", - "--tag", be.docker_tag + "-ARMv7", - "--build-arg", "WHEEL_MITMPROXY={}".format(whl), - "--build-arg", "WHEEL_BASENAME_MITMPROXY={}".format(os.path.basename(whl)), - "--file", "release/docker/DockerfileARMv7", - "." - ]) + "run", + "--rm", + be.docker_tag, + "mitmdump", + "--version", + ], check=True, capture_output=True) + print(r.stdout.decode()) + assert "Mitmproxy: " in r.stdout.decode() def build_pyinstaller(be: BuildEnviron): # pragma: no cover @@ -569,11 +571,10 @@ def upload(): # pragma: no cover "-u", be.docker_username, "-p", be.docker_password, ]) - for variant in ["", "-ARMv7"]: - subprocess.check_call(["docker", "push", be.docker_tag + variant]) - if be.is_prod_release: - subprocess.check_call(["docker", "tag", be.docker_tag + variant, "mitmproxy/mitmproxy:latest" + variant]) - subprocess.check_call(["docker", "push", "mitmproxy/mitmproxy:latest" + variant]) + subprocess.check_call(["docker", "push", be.docker_tag]) + if be.is_prod_release: + subprocess.check_call(["docker", "tag", be.docker_tag, "mitmproxy/mitmproxy:latest"]) + subprocess.check_call(["docker", "push", "mitmproxy/mitmproxy:latest"]) if __name__ == "__main__": # pragma: no cover |