Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ services:
- SWARM=0 #optional
- SYSTEM=0 #optional
- TASKS=0 #optional
- TZ=Etc/UTC #optional
- VERSION=1 #optional
- VOLUMES=0 #optional
- LIBPOD_CONTAINERS=0 #optional
Expand All @@ -201,6 +200,9 @@ services:
- LIBPOD_SYSTEM=0 #optional
- LIBPOD_VERSION=1 #optional
- LIBPOD_VOLUMES=0 #optional
- TIMEOUT_CLIENT=10 #optional
- TIMEOUT_SERVER=10 #optional
- TZ=Etc/UTC #optional
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
restart: unless-stopped
Expand Down Expand Up @@ -265,6 +267,8 @@ docker run -d \
-e LIBPOD_SYSTEM=0 `#optional` \
-e LIBPOD_VERSION=1 `#optional` \
-e LIBPOD_VOLUMES=0 `#optional` \
-e TIMEOUT_CLIENT=10 `#optional` \
-e TIMEOUT_SERVER=10 `#optional` \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
--restart unless-stopped \
--read-only \
Expand Down Expand Up @@ -332,6 +336,10 @@ Containers are configured using parameters passed at runtime (such as those abov
| `-e ALLOW_START=0` | `(/libpod)?/(containers∣pods)/{id}/start` |
| `-e ALLOW_STOP=0` | `(/libpod)?/(containers∣pods)/{id}/stop` |
| `-e ALLOW_UNPAUSE=0` | `(/libpod)?/(containers∣pods)/{id}/unpause` |
| **These options control HAProxy settings** | |
| `-e TIMEOUT_CLIENT=10` | Client timeout in minutes |
| `-e TIMEOUT_SERVER=10` | Server timeout in minutes |
| **Docker native options** | |
| `-v /var/run/docker.sock:ro` | Mount the host docker socket into the container. |
| `--read-only` | Make the container filesystem read-only. |
| `--tmpfs /run` | Mount /run to tmpfs (RAM) to make it writeable. |
Expand Down Expand Up @@ -456,6 +464,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **05.10.26:** - Add `TIMEOUT_CLIENT` & `TIMEOUT_SERVER` options.
* **18.08.26:** - Add `ALLOW_ARCHIVE`, `ALLOW_CHANGES`, `ALLOW_EXPORT`, `ALLOW_LOGS`, `ALLOW_TOP` options.
* **15.06.26:** - Rebase to Alpine 3.24.
* **13.06.26:** - Add libpod API support for Podman via `LIBPOD_*` environment variables.
Expand Down
11 changes: 10 additions & 1 deletion readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ full_custom_readme: |
- SWARM=0 #optional
- SYSTEM=0 #optional
- TASKS=0 #optional
- TZ=Etc/UTC #optional
- VERSION=1 #optional
- VOLUMES=0 #optional
- LIBPOD_CONTAINERS=0 #optional
Expand All @@ -208,6 +207,9 @@ full_custom_readme: |
- LIBPOD_SYSTEM=0 #optional
- LIBPOD_VERSION=1 #optional
- LIBPOD_VOLUMES=0 #optional
- TIMEOUT_CLIENT=10 #optional
- TIMEOUT_SERVER=10 #optional
- TZ=Etc/UTC #optional
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
restart: unless-stopped
Expand Down Expand Up @@ -272,6 +274,8 @@ full_custom_readme: |
-e LIBPOD_SYSTEM=0 `#optional` \
-e LIBPOD_VERSION=1 `#optional` \
-e LIBPOD_VOLUMES=0 `#optional` \
-e TIMEOUT_CLIENT=10 `#optional` \
-e TIMEOUT_SERVER=10 `#optional` \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
--restart unless-stopped \
--read-only \
Expand Down Expand Up @@ -339,6 +343,10 @@ full_custom_readme: |
| `-e ALLOW_START=0` | `(/libpod)?/(containers∣pods)/{id}/start` |
| `-e ALLOW_STOP=0` | `(/libpod)?/(containers∣pods)/{id}/stop` |
| `-e ALLOW_UNPAUSE=0` | `(/libpod)?/(containers∣pods)/{id}/unpause` |
| **These options control HAProxy settings** | |
| `-e TIMEOUT_CLIENT=10` | Client timeout in minutes |
| `-e TIMEOUT_SERVER=10` | Server timeout in minutes |
| **Native docker options** | |
| `-v /var/run/docker.sock:ro` | Mount the host docker socket into the container. |
| `--read-only` | Make the container filesystem read-only. |
| `--tmpfs /run` | Mount /run to tmpfs (RAM) to make it writeable. |
Expand Down Expand Up @@ -463,6 +471,7 @@ full_custom_readme: |

## Versions

* **05.10.26:** - Add `TIMEOUT_CLIENT` & `TIMEOUT_SERVER` options.
* **18.08.26:** - Add `ALLOW_ARCHIVE`, `ALLOW_CHANGES`, `ALLOW_EXPORT`, `ALLOW_LOGS`, `ALLOW_TOP` options.
* **15.06.26:** - Rebase to Alpine 3.24.
* **13.06.26:** - Add libpod API support for Podman via `LIBPOD_*` environment variables.
Expand Down
5 changes: 4 additions & 1 deletion root/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ else
BIND_PROTO="[::]:2375 v4v6"
fi

sed "s/@@BIND_PROTO@@/${BIND_PROTO}/g" /templates/haproxy.cfg > /run/haproxy/haproxy.cfg
sed -e "s/@@BIND_PROTO@@/${BIND_PROTO}/g" \
-e "s/@@TIMEOUT_CLIENT@@/${TIMEOUT_CLIENT:-10}m/g" \
-e "s/@@TIMEOUT_SERVER@@/${TIMEOUT_SERVER:-10}m/g" \
/templates/haproxy.cfg > /run/haproxy/haproxy.cfg

echo '
───────────────────────────────────────
Expand Down
4 changes: 2 additions & 2 deletions root/templates/haproxy.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ defaults
timeout http-request 10s
timeout queue 1m
timeout connect 10s
timeout client 10m
timeout server 10m
timeout client @@TIMEOUT_CLIENT@@
timeout server @@TIMEOUT_SERVER@@
timeout http-keep-alive 10s
timeout check 10s
maxconn 2000
Expand Down
Loading