From b40187329885ab4704741c4d5cfee4fc05b2fb50 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Tue, 26 Nov 2019 08:56:29 -0600 Subject: [PATCH] docs: Revert "update proxy section with correct env vars" This reverts commit 1c9bbee3 Those env vars already get set by the startup script given PROXY --- README.md | 6 ++++-- examples/docker-compose-proxied.yml | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 examples/docker-compose-proxied.yml diff --git a/README.md b/README.md index c8562e61..bb95f1f1 100644 --- a/README.md +++ b/README.md @@ -1038,9 +1038,11 @@ For some cases, if e.g. after removing mods, it could be necessary to startup mi ### HTTP Proxy -You may configure the use of an HTTP/HTTPS proxy by passing the proxy's URL via the `HTTPS_PROXY` and `HTTP_PROXY` environment variables. +You may configure the use of an HTTP/HTTPS proxy by passing the proxy's URL via the `PROXY` +environment variable. In [the example compose file](docker-compose-proxied.yml) it references +a companion squid proxy by setting the equivalent of - -e HTTPS_PROXY=proxy:3128 + -e PROXY=proxy:3128 ### Using "noconsole" option diff --git a/examples/docker-compose-proxied.yml b/examples/docker-compose-proxied.yml new file mode 100644 index 00000000..e116f240 --- /dev/null +++ b/examples/docker-compose-proxied.yml @@ -0,0 +1,16 @@ +version: '3' + +services: + mc: +# build: . + image: itzg/minecraft-server + ports: + - 25565:25565 + environment: + EULA: "TRUE" +# TYPE: SPIGOT +# VERSION: 1.11.2 + PROXY: proxy:3128 + proxy: + image: sameersbn/squid +