From b7bab80bfe8207f0c8d32a4e7f9f9b1672d57c00 Mon Sep 17 00:00:00 2001 From: XLion Date: Sat, 28 Sep 2024 23:33:47 +0800 Subject: [PATCH 1/2] Bump S6 overlay and fix env warnings (#472) --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e6982af0..a8a2130a 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM busybox:stable -ARG S6_OVERLAY_VERSION=3.1.1.2 +ARG S6_OVERLAY_VERSION=3.2.0.0 ARG S6_ARCH=x86_64 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz /tmp @@ -12,8 +12,8 @@ RUN \ COPY rootfs / -ENV RELAY relay.example.com -ENV ENCRYPTED_ONLY 0 +ENV RELAY=relay.example.com +ENV ENCRYPTED_ONLY=0 EXPOSE 21115 21116 21116/udp 21117 21118 21119 From b37033d92c53a896d206db4287a889efe2746a97 Mon Sep 17 00:00:00 2001 From: Fionera Date: Sat, 28 Sep 2024 17:34:47 +0200 Subject: [PATCH 2/2] docs: the servers are by comma instead of colon (#462) --- src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 902fc1ee..2cbd9c9d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,9 +17,9 @@ fn main() -> ResultType<()> { "-c --config=[FILE] +takes_value 'Sets a custom config file' -p, --port=[NUMBER(default={RENDEZVOUS_PORT})] 'Sets the listening port' -s, --serial=[NUMBER(default=0)] 'Sets configure update serial number' - -R, --rendezvous-servers=[HOSTS] 'Sets rendezvous servers, separated by colon' + -R, --rendezvous-servers=[HOSTS] 'Sets rendezvous servers, separated by comma' -u, --software-url=[URL] 'Sets download url of RustDesk software of newest version' - -r, --relay-servers=[HOST] 'Sets the default relay servers, separated by colon' + -r, --relay-servers=[HOST] 'Sets the default relay servers, separated by comma' -M, --rmem=[NUMBER(default={RMEM})] 'Sets UDP recv buffer size, set system rmem_max first, e.g., sudo sysctl -w net.core.rmem_max=52428800. vi /etc/sysctl.conf, net.core.rmem_max=52428800, sudo sysctl –p' , --mask=[MASK] 'Determine if the connection comes from LAN, e.g. 192.168.0.0/16' -k, --key=[KEY] 'Only allow the client with the same key'",