Merge pull request #5 from theohbrothers/enhancement/make-resolver-op…

…tional Enhancement: Make `RESOLVER` optional
theohbrothers · Dec 5, 2023 · 792109b · 792109b
2 parents e368538 + 5750ceb
commit 792109b
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![github-release](https://img.shields.io/github/v/release/theohbrothers/docker-nginx-forward-proxy?style=flat-square)](https://github.com/theohbrothers/docker-nginx-forward-proxy/releases/)
 [![docker-image-size](https://img.shields.io/docker/image-size/theohbrothers/docker-nginx-forward-proxy/latest)](https://hub.docker.com/r/theohbrothers/docker-nginx-forward-proxy)
 
-The `nginx-foward-proxy` is a so simple HTTP proxy server using the nginx, using [`ngx_http_proxy_connect_module`](https://github.com/chobits/ngx_http_proxy_connect_module).
+The `nginx-forward-proxy` is a so simple HTTP proxy server using the nginx, using [`ngx_http_proxy_connect_module`](https://github.com/chobits/ngx_http_proxy_connect_module).
 
 You can easily build a HTTP proxy server using this.
 
@@ -16,13 +16,17 @@ You can easily build a HTTP proxy server using this.
 | `:1.24.0` | [View](variants/1.24.0) |
 | `:1.23.4` | [View](variants/1.23.4) |
 
-
 ## Usage
 
 ```sh
 docker run --rm -it -p 3128:3128 theohbrothers/docker-nginx-forward-proxy:latest
+
+# Test it
 curl -x http://127.0.0.1:3128 http://example.com
 curl -x http://127.0.0.1:3128 https://example.com
+# Or
+http_proxy=http://127.0.0.1:3128 curl http://example.com
+HTTPS_PROXY=http://127.0.0.1:3128 curl https://example.com
 ```
 
 ### Environment variables

diff --git a/generate/templates/README.md.ps1 b/generate/templates/README.md.ps1
@@ -5,7 +5,7 @@
 [![github-release](https://img.shields.io/github/v/release/theohbrothers/docker-nginx-forward-proxy?style=flat-square)](https://github.com/theohbrothers/docker-nginx-forward-proxy/releases/)
 [![docker-image-size](https://img.shields.io/docker/image-size/theohbrothers/docker-nginx-forward-proxy/latest)](https://hub.docker.com/r/theohbrothers/docker-nginx-forward-proxy)
 
-The ``nginx-foward-proxy`` is a so simple HTTP proxy server using the nginx, using [``ngx_http_proxy_connect_module``](https://github.com/chobits/ngx_http_proxy_connect_module).
+The ``nginx-forward-proxy`` is a so simple HTTP proxy server using the nginx, using [``ngx_http_proxy_connect_module``](https://github.com/chobits/ngx_http_proxy_connect_module).
 
 You can easily build a HTTP proxy server using this.
 
@@ -32,13 +32,17 @@ $(
 "@
 
 @'
-
 ## Usage
 
 ```sh
 docker run --rm -it -p 3128:3128 theohbrothers/docker-nginx-forward-proxy:latest
+
+# Test it
 curl -x http://127.0.0.1:3128 http://example.com
 curl -x http://127.0.0.1:3128 https://example.com
+# Or
+http_proxy=http://127.0.0.1:3128 curl http://example.com
+HTTPS_PROXY=http://127.0.0.1:3128 curl https://example.com
 ```
 
 ### Environment variables

diff --git a/generate/templates/docker-entrypoint.sh.ps1 b/generate/templates/docker-entrypoint.sh.ps1
@@ -2,7 +2,7 @@
 #!/bin/sh
 set -eu
 
-RESOLVER=${RESOLVER:-1.1.1.1 ipv6=off}
+RESOLVER=${RESOLVER:-}
 if [ -n "$RESOLVER" ]; then
     echo "Applying: resolver $RESOLVER;"
     sed -i "s/# resolver.*/resolver $RESOLVER;/" /usr/local/nginx/conf/nginx.conf

diff --git a/generate/templates/nginx.conf b/generate/templates/nginx.conf
@@ -13,7 +13,7 @@ http {
     access_log /dev/stdout;
     error_log  /dev/stderr;
 
-    # resolver 1.1.1.1 ipv6=off;
+    resolver 1.1.1.1 ipv6=off;
 
     proxy_connect;
     proxy_connect_allow           443 563;

diff --git a/variants/1.23.4/docker-entrypoint.sh b/variants/1.23.4/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 
-RESOLVER=${RESOLVER:-1.1.1.1 ipv6=off}
+RESOLVER=${RESOLVER:-}
 if [ -n "$RESOLVER" ]; then
     echo "Applying: resolver $RESOLVER;"
     sed -i "s/# resolver.*/resolver $RESOLVER;/" /usr/local/nginx/conf/nginx.conf

diff --git a/variants/1.23.4/nginx.conf b/variants/1.23.4/nginx.conf
@@ -13,7 +13,7 @@ http {
     access_log /dev/stdout;
     error_log  /dev/stderr;
 
-    # resolver 1.1.1.1 ipv6=off;
+    resolver 1.1.1.1 ipv6=off;
 
     proxy_connect;
     proxy_connect_allow           443 563;

diff --git a/variants/1.24.0/docker-entrypoint.sh b/variants/1.24.0/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 
-RESOLVER=${RESOLVER:-1.1.1.1 ipv6=off}
+RESOLVER=${RESOLVER:-}
 if [ -n "$RESOLVER" ]; then
     echo "Applying: resolver $RESOLVER;"
     sed -i "s/# resolver.*/resolver $RESOLVER;/" /usr/local/nginx/conf/nginx.conf

diff --git a/variants/1.24.0/nginx.conf b/variants/1.24.0/nginx.conf
@@ -13,7 +13,7 @@ http {
     access_log /dev/stdout;
     error_log  /dev/stderr;
 
-    # resolver 1.1.1.1 ipv6=off;
+    resolver 1.1.1.1 ipv6=off;
 
     proxy_connect;
     proxy_connect_allow           443 563;

diff --git a/variants/1.25.3/docker-entrypoint.sh b/variants/1.25.3/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 
-RESOLVER=${RESOLVER:-1.1.1.1 ipv6=off}
+RESOLVER=${RESOLVER:-}
 if [ -n "$RESOLVER" ]; then
     echo "Applying: resolver $RESOLVER;"
     sed -i "s/# resolver.*/resolver $RESOLVER;/" /usr/local/nginx/conf/nginx.conf

diff --git a/variants/1.25.3/nginx.conf b/variants/1.25.3/nginx.conf
@@ -13,7 +13,7 @@ http {
     access_log /dev/stdout;
     error_log  /dev/stderr;
 
-    # resolver 1.1.1.1 ipv6=off;
+    resolver 1.1.1.1 ipv6=off;
 
     proxy_connect;
     proxy_connect_allow           443 563;