4 files changed, 12 insertions, 55 deletions
diff --git a/release/docker/Dockerfile b/release/docker/Dockerfile
index 258bccf5..5f496e9f 100644
--- a/release/docker/Dockerfile
+++ b/release/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM alpine:3.11
 
 ENV LANG=en_US.UTF-8
 
diff --git a/release/docker/DockerfileARMv7 b/release/docker/DockerfileARMv7
deleted file mode 100644
index 40f10ede..00000000
--- a/release/docker/DockerfileARMv7
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM resin/raspberrypi3-alpine:3.7
-
-ENV LANG=en_US.UTF-8
-
-ARG WHEEL_MITMPROXY
-ARG WHEEL_BASENAME_MITMPROXY
-
-COPY $WHEEL_MITMPROXY /home/mitmproxy/
-
-RUN [ "cross-build-start" ]
-
-# Add our user first to make sure the ID get assigned consistently,
-# regardless of whatever dependencies get added.
-RUN addgroup -S mitmproxy && adduser -S -G mitmproxy mitmproxy \
-    && apk add --no-cache \
-        su-exec \
-        git \
-        g++ \
-        libffi \
-        libffi-dev \
-        libstdc++ \
-        openssl \
-        openssl-dev \
-        python3 \
-        python3-dev \
-    && python3 -m ensurepip --upgrade \
-    && pip3 install -U pip \
-    && LDFLAGS=-L/lib pip3 install -U /home/mitmproxy/${WHEEL_BASENAME_MITMPROXY} \
-    && apk del --purge \
-        git \
-        g++ \
-        libffi-dev \
-        openssl-dev \
-        python3-dev \
-    && rm -rf ~/.cache/pip /home/mitmproxy/${WHEEL_BASENAME_MITMPROXY}
-
-RUN [ "cross-build-end" ]
-
-VOLUME /home/mitmproxy/.mitmproxy
-
-COPY release/docker/docker-entrypoint.sh /usr/local/bin/
-ENTRYPOINT ["docker-entrypoint.sh"]
-
-EXPOSE 8080 8081
-
-CMD ["mitmproxy"]
diff --git a/release/docker/README.md b/release/docker/README.md
index 2fa93949..df9834b8 100644
--- a/release/docker/README.md
+++ b/release/docker/README.md
@@ -40,8 +40,7 @@ The available release tags can be seen
 
 * `master` always tracks the git-master branch and represents the unstable development tree.
 * `latest` always points to the same image as the most recent stable release, including bugfix releases (e.g., `4.0.0` and `4.0.1`).
-* `X.Y.Z` tags contain the mitmproxy release with this version number.  
-* `*-ARMv7` are images built for Raspbian / Raspberry Pi systems.
+* `X.Y.Z` tags contain the mitmproxy release with this version number.
 
 # Security Notice
 
diff --git a/release/docker/docker-entrypoint.sh b/release/docker/docker-entrypoint.sh
index a4abe4ce..84ea81e6 100755
--- a/release/docker/docker-entrypoint.sh
+++ b/release/docker/docker-entrypoint.sh
@@ -1,13 +1,17 @@
 #!/bin/sh
-set -e
+# WARNING: do not change the shebang - the Docker base image might not have what you want!
+
+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