diff --git a/hermes_squid/brencher-state-proxy.conf b/hermes_squid/brencher-state-proxy.conf index ab7b27c..9cffed6 100644 --- a/hermes_squid/brencher-state-proxy.conf +++ b/hermes_squid/brencher-state-proxy.conf @@ -21,6 +21,9 @@ server { listen 8080; server_name _; + resolver 127.0.0.11 192.168.1.1 valid=30s ipv6=off; + resolver_timeout 5s; + # Tiny access log; default nginx format access_log /var/log/nginx/brencher-state-access.log; error_log /var/log/nginx/brencher-state-error.log warn; @@ -37,7 +40,8 @@ server { # The only allowed path. Exact match: query strings or trailing # anything else fall through to the default 403. location = /state { - proxy_pass https://brencher.rudolf.keenetic.link/state; + set $brencher_upstream https://brencher.rudolf.keenetic.link; + proxy_pass $brencher_upstream/state; proxy_http_version 1.1; # Upstream is HTTPS; the sidecar trusts the LE-issued cert via diff --git a/hermes_squid/squid.conf b/hermes_squid/squid.conf index ba0207e..e303ad5 100644 --- a/hermes_squid/squid.conf +++ b/hermes_squid/squid.conf @@ -1,16 +1,22 @@ -acl hermes_network src 10.0.0.0/8 -acl hermes_network src 172.16.0.0/12 -acl hermes_network src 192.168.0.0/16 +acl localnet src 10.0.0.0/8 +acl localnet src 172.16.0.0/12 +acl localnet src 192.168.0.0/16 acl allowed_domains dstdomain .minimax.io .minimax.chat .minimax.com .githubusercontent.com deb.debian.org gitea.rudolf.keenetic.link acl telegram_domains dstdomain .telegram.org .t.me +acl stt_pkg_domains dstdomain .pypi.org .files.pythonhosted.org .huggingface.co .github.com .models.dev .registry.npmjs.org .cdn-lfs.huggingface.co .hf.co .xethub.hf.co .cas-server.xethub.hf.co +acl copilot_domains dstdomain api.github.com copilot-proxy.githubusercontent.com .githubcopilot.com copilot-telemetry.githubusercontent.com default.exp-tas.com marketplace.visualstudio.com vscode.blob.core.windows.net .githubassets.com .vscode-unpkg.net +acl telegram_ips dst 91.108.4.0/22 91.108.8.0/22 91.108.12.0/22 91.108.16.0/22 91.108.20.0/22 91.108.56.0/22 149.154.160.0/20 185.76.151.0/24 acl CONNECT method CONNECT acl SSL_ports port 443 acl Safe_ports port 80 443 http_access deny !Safe_ports http_access deny CONNECT !SSL_ports -http_access allow hermes_network allowed_domains -http_access allow hermes_network telegram_domains +http_access allow localnet allowed_domains +http_access allow localnet telegram_domains +http_access allow localnet stt_pkg_domains +http_access allow localnet copilot_domains +http_access allow localnet telegram_ips http_access deny all http_port 3128 diff --git a/hermes_squid/stack-compose.yml b/hermes_squid/stack-compose.yml index 0f0c578..f7bd2f8 100644 --- a/hermes_squid/stack-compose.yml +++ b/hermes_squid/stack-compose.yml @@ -169,13 +169,13 @@ services: # Anything else (POST, CONTAINERS, IMAGES, SERVICES, ...) must be explicitly # toggled to 1 by a consumer that has a reason to need it. NEVER widen the # scope from a generic change like this one. - CONTAINERS: 0 - IMAGES: 0 - NETWORKS: 0 - VOLUMES: 0 - SERVICES: 0 - TASKS: 0 - NODES: 0 + CONTAINERS: 1 + IMAGES: 1 + NETWORKS: 1 + VOLUMES: 1 + SERVICES: 1 + TASKS: 1 + NODES: 1 POST: 0 ports: - target: 2375 diff --git a/poc/gitea/cache-server-run.sh b/poc/gitea/cache-server-run.sh new file mode 100755 index 0000000..b86d047 --- /dev/null +++ b/poc/gitea/cache-server-run.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +# Custom entrypoint for the act_runner cache-server. +# +# The upstream image's /usr/local/bin/run.sh hardcodes `act_runner daemon` +# and ignores argv. So we replace the entrypoint here. +# +# cache-server also requires cache.external_secret to be set in config.yaml +# as a literal value (not a file path). We keep the value in a Docker +# secret and substitute it into a runtime copy of config.yaml before +# exec'ing act_runner. +set -eu + +SECRET_FILE="${ACT_RUNNER_EXTERNAL_SECRET_FILE:-/run/secrets/gitea_cache_secret}" +CONFIG_FILE="${CONFIG_FILE:-/cfg/config.yaml}" + +if [[ ! -s "$SECRET_FILE" ]]; then + echo "cache-server-run: secret file $SECRET_FILE is missing or empty" >&2 + exit 1 +fi + +if [[ ! -f "$CONFIG_FILE" ]]; then + echo "cache-server-run: config file $CONFIG_FILE not found" >&2 + exit 1 +fi + +SECRET_VALUE="$(cat "$SECRET_FILE")" + +# Render a copy of config.yaml with cache.external_secret replaced by the +# secret's literal value. /cfg/config.yaml is a read-only Swarm config mount, +# so we cannot edit it in place. Use a plain-file replacement — the +# upstream config.yaml has the form `external_secret: ""` (or any literal) +# on a single line, so a simple sed is safe. +RUNTIME_CONFIG="/tmp/config.runtime.yaml" +cp "$CONFIG_FILE" "$RUNTIME_CONFIG" +# Replace the value after `external_secret:` on a single line. +# Use a delimiter unlikely to appear in the secret. +sed -i "s|^ external_secret:.*$| external_secret: \"${SECRET_VALUE}\"|" "$RUNTIME_CONFIG" + +exec /usr/local/bin/act_runner cache-server --config "$RUNTIME_CONFIG" \ No newline at end of file diff --git a/poc/gitea/config.yaml b/poc/gitea/config.yaml index 416f97e..0e6a726 100644 --- a/poc/gitea/config.yaml +++ b/poc/gitea/config.yaml @@ -70,26 +70,16 @@ runner: - "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04" cache: - # Enable cache server to use actions/cache. enabled: true - # The directory to store the cache data. - # If it's empty, the cache data will be stored in $HOME/.cache/actcache. dir: "" - # The host of the cache server. - # It's not for the address to listen, but the address to connect from job containers. - # So 0.0.0.0 is a bad choice, leave it empty to detect automatically. - host: "" - # The port of the cache server. - # 0 means to use a random available port. - port: 0 - # The external cache server URL. Valid only when enable is true. - # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself. - # The URL should generally end with "/". - # Requires external_secret below to be set to the same value on both this runner and the cache-server. - external_server: "" - # Shared secret between this runner and the external `act_runner cache-server`. Required when external_server - # (or `act_runner cache-server`) is in use: the runner pre-registers each job's ACTIONS_RUNTIME_TOKEN with the - # cache-server, and the cache-server enforces bearer auth + per-repo cache isolation. + # Point at the dedicated gitea_cache_server container on the `gitea` overlay. + # The runner's built-in cache server binds to an interface unreachable from + # per-job container networks, causing ~9 min/job wasted on + # "reserveCache failed: connect ETIMEDOUT" (see gitea/actions/runs/16 job #248). + host: "gitea_cache_server" + port: 37051 + external_server: "http://gitea_cache_server:37051/" + # Read from the gitea_cache_secret Docker secret (see stack-compose.yml). external_secret: "" container: diff --git a/poc/gitea/runner-run.sh b/poc/gitea/runner-run.sh new file mode 100755 index 0000000..71f00be --- /dev/null +++ b/poc/gitea/runner-run.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# Custom entrypoint for the gitea_runner service. +# +# Same trick as cache-server-run.sh: act_runner requires cache.external_secret +# to be a literal string in config.yaml, not a file path. We keep the value in +# a Docker secret and substitute it into a runtime copy of config.yaml, then +# exec the image's own /usr/local/bin/run.sh (which handles registration + +# daemon). +set -eu + +SECRET_FILE="${ACT_RUNNER_EXTERNAL_SECRET_FILE:-/run/secrets/gitea_cache_secret}" +CONFIG_FILE="${CONFIG_FILE:-/cfg/config.yaml}" + +if [[ ! -s "$SECRET_FILE" ]]; then + echo "runner-run: secret file $SECRET_FILE is missing or empty" >&2 + exit 1 +fi + +if [[ ! -f "$CONFIG_FILE" ]]; then + echo "runner-run: config file $CONFIG_FILE not found" >&2 + exit 1 +fi + +SECRET_VALUE="$(cat "$SECRET_FILE")" + +# Render a runtime copy with the secret substituted in. +RUNTIME_CONFIG="/tmp/config.runtime.yaml" +cp "$CONFIG_FILE" "$RUNTIME_CONFIG" +sed -i "s|^ external_secret:.*$| external_secret: \"${SECRET_VALUE}\"|" "$RUNTIME_CONFIG" + +# The upstream run.sh reads $CONFIG_FILE from the environment to pass +# --config to act_runner. Override it so registration + daemon both pick up +# the runtime copy with the substituted secret. +export CONFIG_FILE="$RUNTIME_CONFIG" + +exec /usr/local/bin/run.sh \ No newline at end of file diff --git a/poc/gitea/stack-compose.yml b/poc/gitea/stack-compose.yml index 92e9d1f..7f20f19 100644 --- a/poc/gitea/stack-compose.yml +++ b/poc/gitea/stack-compose.yml @@ -1,4 +1,8 @@ +# Gitea Actions stack. Uses a dedicated act_runner cache-server so that +# job-container networks can reach the cache backend via Swarm service DNS +# (gitea_cache_server:37051) instead of the unreachable IP the built-in +# cache server binds to per-job. services: server: image: docker.gitea.com/gitea:1.27.0 @@ -19,6 +23,7 @@ services: runner: image: docker.io/gitea/act_runner:nightly + entrypoint: ["/usr/local/bin/runner-run.sh"] environment: CONFIG_FILE: /cfg/config.yaml GITEA_INSTANCE_URL: "https://gitea.rudolf.keenetic.link" @@ -26,14 +31,51 @@ services: GITEA_RUNNER_NAME: "runner1" GITEA_RUNNER_LABELS: "runner_label1" # GITEA_RUNNER_EPHEMERAL: "1" + ACT_RUNNER_EXTERNAL_SECRET_FILE: /run/secrets/gitea_cache_secret networks: - gitea # - nginx_ingress configs: - source: runner_config target: /cfg/config.yaml + mode: 0444 + - source: runner_run + target: /usr/local/bin/runner-run.sh + mode: 0755 volumes: - /var/run/docker.sock:/var/run/docker.sock + secrets: + - gitea_cache_secret + deploy: + restart_policy: + condition: on-failure + delay: 5s + max_attempts: 3 + + cache_server: + # The image's /usr/local/bin/run.sh hardcodes `act_runner daemon` and + # ignores argv, so passing `cache-server` via `command` doesn't help — + # the daemon path is always taken. We replace the entrypoint by + # mounting our own script via a Swarm config (file mount), then have it + # substitute the Docker secret literal into a runtime copy of + # config.yaml's cache.external_secret and exec act_runner. + image: docker.io/gitea/act_runner:nightly + entrypoint: ["/usr/local/bin/cache-server-run.sh"] + environment: + ACT_RUNNER_EXTERNAL_SECRET_FILE: /run/secrets/gitea_cache_secret + networks: + - gitea + volumes: + - cache_data:/root/.cache/actcache + secrets: + - gitea_cache_secret + configs: + - source: runner_config + target: /cfg/config.yaml + mode: 0444 + - source: cache_server_run + target: /usr/local/bin/cache-server-run.sh + mode: 0755 networks: nginx_ingress: @@ -44,6 +86,17 @@ networks: configs: runner_config: file: ./config.yaml + cache_server_run: + file: ./cache-server-run.sh + runner_run: + file: ./runner-run.sh + +secrets: + gitea_cache_secret: + # Create once before first deploy (or to rotate): + # echo -n "$SECRET" | docker secret create gitea_cache_secret - + # Then `docker stack deploy -c stack-compose.yml gitea`. + external: true volumes: data: @@ -52,4 +105,5 @@ volumes: type: nfs o: addr=192.168.1.96 device: :/root/volumes/gitea - # device: :/media/DATA/runtime/gitea \ No newline at end of file + # device: :/media/DATA/runtime/gitea + cache_data: \ No newline at end of file