Merge branch 'master' into udp_buffer

This commit is contained in:
bt90 2021-05-03 22:32:55 +02:00 committed by GitHub
commit e44b26f397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 7 deletions

View File

@ -57,5 +57,5 @@ COPY --from=buildstage /tmp/sync/syncthing /usr/bin/
COPY root/ /
# ports and volumes
EXPOSE 8384 22000 21027/UDP
EXPOSE 8384 22000/tcp 22000/udp 21027/UDP
VOLUME /config

View File

@ -57,5 +57,5 @@ COPY --from=buildstage /tmp/sync/syncthing /usr/bin/
COPY root/ /
# ports and volumes
EXPOSE 8384 22000 21027/UDP
EXPOSE 8384 22000/tcp 22000/udp 21027/UDP
VOLUME /config

View File

@ -57,5 +57,5 @@ COPY --from=buildstage /tmp/sync/syncthing /usr/bin/
COPY root/ /
# ports and volumes
EXPOSE 8384 22000 21027/UDP
EXPOSE 8384 22000/tcp 22000/udp 21027/UDP
VOLUME /config

View File

@ -87,7 +87,8 @@ services:
- /path/to/data2:/data2
ports:
- 8384:8384
- 22000:22000
- 22000:22000/tcp
- 22000:22000/udp
- 21027:21027/udp
restart: unless-stopped
```
@ -102,7 +103,8 @@ docker run -d \
-e PGID=1000 \
-e TZ=Europe/London \
-p 8384:8384 \
-p 22000:22000 \
-p 22000:22000/tcp \
-p 22000:22000/udp \
-p 21027:21027/udp \
-v /path/to/appdata/config:/config \
-v /path/to/data1:/data1 \
@ -119,7 +121,8 @@ Container images are configured using parameters passed at runtime (such as thos
| :----: | --- |
| `--hostname=` | Optionally the hostname can be defined. |
| `-p 8384` | Application WebUI |
| `-p 22000` | Listening port |
| `-p 22000/tcp` | Listening port (TCP) |
| `-p 22000/udp` | Listening port (UDP) |
| `-p 21027/udp` | Protocol discovery |
| `-e PUID=1000` | for UserID - see below for explanation |
| `-e PGID=1000` | for GroupID - see below for explanation |
@ -237,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **03.05.21:** - Add port mapping for 22000/udp.
* **29.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
* **23.01.21:** - Rebasing to alpine 3.13.
* **15.09.20:** - Use go from alpine edge repo to compile. Remove duplicate UMASK env var. Add hostname setting.

View File

@ -30,7 +30,8 @@ param_volumes:
param_usage_include_ports: true
param_ports:
- { external_port: "8384", internal_port: "8384", port_desc: "Application WebUI" }
- { external_port: "22000", internal_port: "22000", port_desc: "Listening port" }
- { external_port: "22000", internal_port: "22000/tcp", port_desc: "Listening port (TCP)" }
- { external_port: "22000", internal_port: "22000/udp", port_desc: "Listening port (UDP)" }
- { external_port: "21027", internal_port: "21027/udp", port_desc: "Protocol discovery" }
custom_params:
- { name: "sysctl", name_compose: "sysctls", value: ["net.core.rmem_max=2097152"], desc: "Raise maximum UDP buffer size.", array: "true" }
@ -45,6 +46,7 @@ app_setup_nginx_reverse_proxy_block: ""
changelogs:
- { date: "03.05.21:", desc: "Raise maximum UDP buffer size." }
- { date: "03.05.21:", desc: "Add port mapping for 22000/udp." }
- { date: "29.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
- { date: "15.09.20:", desc: "Use go from alpine edge repo to compile. Remove duplicate UMASK env var. Add hostname setting." }