aboutsummaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2019-12-21 02:33:58 +0100
committerMaximilian Hils <git@maximilianhils.com>2019-12-21 03:18:19 +0100
commitb48260d20e98053d63bad9d93ee975bdfbb1a3c7 (patch)
treef8e01db5cd4a4b2bed3d0920c8cad62d0432a69f /release
parente48c91b0a4d12dbf67aae96f1808bc5440ef7674 (diff)
downloadmitmproxy-b48260d20e98053d63bad9d93ee975bdfbb1a3c7.tar.gz
mitmproxy-b48260d20e98053d63bad9d93ee975bdfbb1a3c7.tar.bz2
mitmproxy-b48260d20e98053d63bad9d93ee975bdfbb1a3c7.zip
docker: auto-update latest tag
Diffstat (limited to 'release')
-rw-r--r--release/README.md8
-rwxr-xr-xrelease/cibuild.py7
2 files changed, 10 insertions, 5 deletions
diff --git a/release/README.md b/release/README.md
index 97632a36..1b8614ea 100644
--- a/release/README.md
+++ b/release/README.md
@@ -29,9 +29,11 @@ These steps assume you are on the correct branch and have a git remote called `o
`brew bump-formula-pr --url https://github.com/mitmproxy/mitmproxy/archive/v<version number here>`
### Docker
-- The docker image is built on Travis and pushed to Docker Hub automatically.
-- Please check https://hub.docker.com/r/mitmproxy/mitmproxy/tags/ about the latest version.
-- Update `latest` tag: `export VERSION=4.0.3 && docker pull mitmproxy/mitmproxy:$VERSION && docker tag mitmproxy/mitmproxy:$VERSION mitmproxy/mitmproxy:latest && docker push mitmproxy/mitmproxy:latest`.
+- The docker image is built by our CI workers and pushed to Docker Hub automatically.
+- Please verify that https://hub.docker.com/r/mitmproxy/mitmproxy/tags/ has the latest version.
+- The latest and latest-ARMv7 tags should auto-update. @mhils introduced this after the 5.0.0 release.
+ Please verify that this is the case and remove this notice. For reference, this is how to do it manually:
+ `export VERSION=4.0.3 && docker pull mitmproxy/mitmproxy:$VERSION && docker tag mitmproxy/mitmproxy:$VERSION mitmproxy/mitmproxy:latest && docker push mitmproxy/mitmproxy:latest`.
### Docs
- `./build-current`. If everything looks alright, continue with
diff --git a/release/cibuild.py b/release/cibuild.py
index 46066099..b2bad9a0 100755
--- a/release/cibuild.py
+++ b/release/cibuild.py
@@ -569,8 +569,11 @@ def upload(): # pragma: no cover
"-u", be.docker_username,
"-p", be.docker_password,
])
- subprocess.check_call(["docker", "push", be.docker_tag])
- subprocess.check_call(["docker", "push", be.docker_tag + "-ARMv7"])
+ 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])
if __name__ == "__main__": # pragma: no cover