From 5a3efb9d83e565c54fbf0712f8cb2d68188be2a9 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sun, 14 Jan 2024 17:57:26 +0700 Subject: [PATCH] wtf --- config.toml | 2 +- dist-server.sh | 6 +++++- docker-compose.yml | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 42a369c..2892f98 100644 --- a/config.toml +++ b/config.toml @@ -4,7 +4,7 @@ cache_dir = "/var/cache/sccache" # If unspecified the default is 10GB. # toolchain_cache_size = 10737418240 # A public IP address and port that clients will use to connect to this builder. -public_addr = "$PUBLIC_ADDR:10600" +public_addr = "0.0.0.0:10600" # The URL used to connect to the scheduler (should use https, given an ideal # setup of a HTTPS server in front of the scheduler) scheduler_url = "$SCHEDULER_URL" diff --git a/dist-server.sh b/dist-server.sh index 3cd27d5..3bfd468 100644 --- a/dist-server.sh +++ b/dist-server.sh @@ -19,6 +19,10 @@ while [ "$PUBLIC_ADDR" == "null" ]; do export PUBLIC_ADDR=$(get_tailscale_ip) done +export PUBLIC_ADDR="$PUBLIC_ADDR:10600" + +ip addr show + REQUIRED_ENVS=( "SERVER_TOKEN" "SCHEDULER_URL" @@ -36,4 +40,4 @@ done envsubst <$CONFIG_TEMPLATE > $CONFIG_FILE -sccache-dist server --config $CONFIG_FILE +sccache-dist server --config $CONFIG_FILE --syslog debug diff --git a/docker-compose.yml b/docker-compose.yml index ddb868b..409db30 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,8 @@ services: sccache-server: + build: + context: . + dockerfile: Dockerfile image: ghcr.io/fyralabs/fyra-build-client:main privileged: true depends_on: @@ -8,6 +11,8 @@ services: volumes: - cache:/var/cache/sccache - /tmp/tailscale:/tmp + env_file: + - .env tailscale: image: tailscale/tailscale:latest