diff --git a/Dockerfile b/Dockerfile index e3dd769..eb34123 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,7 @@ ENV ALLOW_RESTARTS=0 \ EXEC=0 \ IMAGES=0 \ INFO=0 \ + LOG_LEVEL=info \ NETWORKS=0 \ NODES=0 \ PING=1 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e3dd769..eb34123 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -41,6 +41,7 @@ ENV ALLOW_RESTARTS=0 \ EXEC=0 \ IMAGES=0 \ INFO=0 \ + LOG_LEVEL=info \ NETWORKS=0 \ NODES=0 \ PING=1 \ diff --git a/README.md b/README.md index ac2cd02..8835a61 100644 --- a/README.md +++ b/README.md @@ -95,6 +95,7 @@ services: - EXEC=0 #optional - IMAGES=0 #optional - INFO=0 #optional + - LOG_LEVEL=info #optional - NETWORKS=0 #optional - NODES=0 #optional - PING=1 #optional @@ -135,6 +136,7 @@ docker run -d \ -e EXEC=0 `#optional` \ -e IMAGES=0 `#optional` \ -e INFO=0 `#optional` \ + -e LOG_LEVEL=info `#optional` \ -e NETWORKS=0 `#optional` \ -e NODES=0 `#optional` \ -e PING=1 `#optional` \ @@ -175,6 +177,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e EXEC=0` | `/exec` & `/containers/{id}/exec` | | `-e IMAGES=0` | `/images` | | `-e INFO=0` | `/info` | +| `-e LOG_LEVEL=info` | Possible values are: debug, info, notice, warning, err, crit, alert and emerg. Defaults to info. | | `-e NETWORKS=0` | `/networks` | | `-e NODES=0` | `/nodes` | | `-e PING=1` | `/_ping` | @@ -312,6 +315,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **08.04.25:** - Add `LOG_LEVEL` back. * **06.04.25:** - Switch back to haproxy for better handling of `docker exec` connection hijacking. * **02.01.25:** - Support custom read timeout values. * **05.12.24:** - Rebase to Alpine 3.21. diff --git a/readme-vars.yml b/readme-vars.yml index 574e632..fc67295 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -102,6 +102,7 @@ full_custom_readme: | - EXEC=0 #optional - IMAGES=0 #optional - INFO=0 #optional + - LOG_LEVEL=info #optional - NETWORKS=0 #optional - NODES=0 #optional - PING=1 #optional @@ -142,6 +143,7 @@ full_custom_readme: | -e EXEC=0 `#optional` \ -e IMAGES=0 `#optional` \ -e INFO=0 `#optional` \ + -e LOG_LEVEL=info `#optional` \ -e NETWORKS=0 `#optional` \ -e NODES=0 `#optional` \ -e PING=1 `#optional` \ @@ -182,6 +184,7 @@ full_custom_readme: | | `-e EXEC=0` | `/exec` & `/containers/{id}/exec` | | `-e IMAGES=0` | `/images` | | `-e INFO=0` | `/info` | + | `-e LOG_LEVEL=info` | Possible values are: debug, info, notice, warning, err, crit, alert and emerg. Defaults to info. | | `-e NETWORKS=0` | `/networks` | | `-e NODES=0` | `/nodes` | | `-e PING=1` | `/_ping` | @@ -319,6 +322,7 @@ full_custom_readme: | ## Versions + * **08.04.25:** - Add `LOG_LEVEL` back. * **06.04.25:** - Switch back to haproxy for better handling of `docker exec` connection hijacking. * **02.01.25:** - Support custom read timeout values. * **05.12.24:** - Rebase to Alpine 3.21. diff --git a/root/templates/haproxy.cfg b/root/templates/haproxy.cfg index 965de9a..a4fd70f 100644 --- a/root/templates/haproxy.cfg +++ b/root/templates/haproxy.cfg @@ -1,5 +1,5 @@ global - log stdout format raw daemon info + log stdout format raw daemon "${LOG_LEVEL}" pidfile /run/haproxy.pid maxconn 2000