aboutsummaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2020-04-12 22:06:22 +0200
committerGitHub <noreply@github.com>2020-04-12 22:06:22 +0200
commit30645fa1ac6fa828bda390383abee7c04f20206f (patch)
tree10b599dab550e06c6d2d9ffb37dd1a3cf783922a /release
parentce50e8e52dc5316f9be29bc00d0dc72fc2b0af83 (diff)
parent55527c00eb35bf3b07b361363fd8ca2961afc8ba (diff)
downloadmitmproxy-30645fa1ac6fa828bda390383abee7c04f20206f.tar.gz
mitmproxy-30645fa1ac6fa828bda390383abee7c04f20206f.tar.bz2
mitmproxy-30645fa1ac6fa828bda390383abee7c04f20206f.zip
Merge pull request #3921 from Kriechi/example-docs
Example docs
Diffstat (limited to 'release')
-rw-r--r--release/README.md8
-rwxr-xr-xrelease/docker/docker-entrypoint.sh17
2 files changed, 14 insertions, 11 deletions
diff --git a/release/README.md b/release/README.md
index 8632d644..1de0824f 100644
--- a/release/README.md
+++ b/release/README.md
@@ -37,10 +37,10 @@ These steps assume you are on the correct branch and have a git remote called `o
`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
- - `./upload-stable`,
- - `./build-archive`, and
- - `./upload-archive v4`. Doing this now already saves you from switching back to an old state on the next release.
+ - `./build.sh`. If everything looks alright, continue with
+ - `./upload-stable.sh`,
+ - `DOCS_ARCHIVE=true ./build.sh`, and
+ - `./upload-archive.sh v4`. Doing this now already saves you from switching back to an old state on the next release.
### Website
- Update version here:
diff --git a/release/docker/docker-entrypoint.sh b/release/docker/docker-entrypoint.sh
index a4abe4ce..7bb3028a 100755
--- a/release/docker/docker-entrypoint.sh
+++ b/release/docker/docker-entrypoint.sh
@@ -1,13 +1,16 @@
-#!/bin/sh
-set -e
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+# set -o xtrace
MITMPROXY_PATH="/home/mitmproxy/.mitmproxy"
if [[ "$1" = "mitmdump" || "$1" = "mitmproxy" || "$1" = "mitmweb" ]]; then
- mkdir -p "$MITMPROXY_PATH"
- chown -R mitmproxy:mitmproxy "$MITMPROXY_PATH"
-
- su-exec mitmproxy "$@"
+ mkdir -p "$MITMPROXY_PATH"
+ chown -R mitmproxy:mitmproxy "$MITMPROXY_PATH"
+ su-exec mitmproxy "$@"
else
- exec "$@"
+ exec "$@"
fi