forked from admin/ansible
Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6444ad49c | ||
|
|
eb851d9b1d | ||
|
|
c719f6ab8d | ||
|
|
6e6f9c67fc | ||
|
|
77b3cc2c08 | ||
|
|
d011648e56 | ||
|
|
c22cadc48b | ||
|
|
2fa05da943 | ||
|
|
3406491dcc | ||
|
|
7a08d4d022 | ||
|
|
6e9a998eba | ||
|
|
ef4af24c1e | ||
|
|
f80a524d33 |
@@ -2,12 +2,16 @@ name: release
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'auto-*'
|
||||
tags:
|
||||
- 'v*'
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
tag:
|
||||
required: true
|
||||
description: 'Image tag (e.g. auto-<sha>)'
|
||||
required: false
|
||||
default: latest
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
@@ -24,13 +28,22 @@ jobs:
|
||||
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||
|
||||
- name: resolve version
|
||||
id: version
|
||||
run: |
|
||||
if [ -n "${{ inputs.tag }}" ] && [ "${{ inputs.tag }}" != "latest" ]; then
|
||||
echo "VERSION=${{ inputs.tag }}" >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
echo "VERSION=${GITHUB_REF_NAME##*/}" >> "$GITHUB_OUTPUT"
|
||||
fi
|
||||
echo "VERSION=$VERSION"
|
||||
|
||||
- name: build and push
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: connectivity_tester
|
||||
file: connectivity_tester/Dockerfile
|
||||
push: true
|
||||
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||
tags: |
|
||||
gitea.rudolf.keenetic.link/admin/connectivity_tester:${{ inputs.tag || github.ref_name }}
|
||||
gitea.rudolf.keenetic.link/admin/connectivity_tester:latest
|
||||
gitea.rudolf.keenetic.link/hermes/connectivity_tester:${{ steps.version.outputs.VERSION }}
|
||||
gitea.rudolf.keenetic.link/hermes/connectivity_tester:latest
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM python:3.12-alpine
|
||||
FROM python:3.12-slim
|
||||
|
||||
WORKDIR /app
|
||||
COPY . /app/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
services:
|
||||
connectivity-tester:
|
||||
image: gitea.rudolf.keenetic.link/${registry_owner}/connectivity_tester:${version}
|
||||
image: gitea.rudolf.keenetic.link/hermes/connectivity_tester:${version}
|
||||
hostname: connectivity-tester
|
||||
user: "0:0"
|
||||
volumes:
|
||||
|
||||
@@ -21,9 +21,6 @@ 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;
|
||||
@@ -40,8 +37,7 @@ server {
|
||||
# The only allowed path. Exact match: query strings or trailing
|
||||
# anything else fall through to the default 403.
|
||||
location = /state {
|
||||
set $brencher_upstream https://brencher.rudolf.keenetic.link;
|
||||
proxy_pass $brencher_upstream/state;
|
||||
proxy_pass https://brencher.rudolf.keenetic.link/state;
|
||||
proxy_http_version 1.1;
|
||||
|
||||
# Upstream is HTTPS; the sidecar trusts the LE-issued cert via
|
||||
|
||||
+5
-11
@@ -1,22 +1,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 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 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 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 allow hermes_network allowed_domains
|
||||
http_access allow hermes_network telegram_domains
|
||||
http_access deny all
|
||||
|
||||
http_port 3128
|
||||
|
||||
@@ -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: 1
|
||||
IMAGES: 1
|
||||
NETWORKS: 1
|
||||
VOLUMES: 1
|
||||
SERVICES: 1
|
||||
TASKS: 1
|
||||
NODES: 1
|
||||
CONTAINERS: 0
|
||||
IMAGES: 0
|
||||
NETWORKS: 0
|
||||
VOLUMES: 0
|
||||
SERVICES: 0
|
||||
TASKS: 0
|
||||
NODES: 0
|
||||
POST: 0
|
||||
ports:
|
||||
- target: 2375
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
#!/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"
|
||||
+18
-8
@@ -70,16 +70,26 @@ 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: ""
|
||||
# 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).
|
||||
# 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.
|
||||
external_secret: ""
|
||||
|
||||
container:
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
#!/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
|
||||
@@ -1,8 +1,4 @@
|
||||
|
||||
# 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
|
||||
@@ -23,7 +19,6 @@ 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"
|
||||
@@ -31,51 +26,14 @@ 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:
|
||||
@@ -86,17 +44,6 @@ 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:
|
||||
@@ -105,5 +52,4 @@ volumes:
|
||||
type: nfs
|
||||
o: addr=192.168.1.96
|
||||
device: :/root/volumes/gitea
|
||||
# device: :/media/DATA/runtime/gitea
|
||||
cache_data:
|
||||
# device: :/media/DATA/runtime/gitea
|
||||
@@ -51,15 +51,5 @@ networks:
|
||||
|
||||
volumes:
|
||||
hermes_gateway_data:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: nfs
|
||||
o: addr=192.168.1.96
|
||||
device: :/root/volumes/hermes/gateway
|
||||
hermes_agent_data:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: nfs
|
||||
o: addr=192.168.1.96
|
||||
device: :/root/volumes/hermes/agent
|
||||
|
||||
|
||||
Reference in New Issue
Block a user