diff --git a/hosts/hl-minipc1/services/buzz.nix b/hosts/hl-minipc1/services/buzz.nix index 272fae0..d540ced 100644 --- a/hosts/hl-minipc1/services/buzz.nix +++ b/hosts/hl-minipc1/services/buzz.nix @@ -19,8 +19,8 @@ let caddy = "caddy:2-alpine"; posgres = "postgres:17-alpine"; redis = "redis:7-alpine"; - minio = "quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z@sha256:14cea493d9a34af32f524e538b8346cf79f3321eff8e708c1e2960462bd8936e"; - mc = "quay.io/minio/mc:RELEASE.2025-08-13T08-35-41Z@sha256:a7fe349ef4bd8521fb8497f55c6042871b2ae640607cf99d9bede5e9bdf11727"; + minio = "chainguard/minio:latest-dev@sha256:8d5a0265f0e18fb3b29f95598147f1cc2a86b782181668bad176b0e90cce9569"; + mc = "chainguard/minio-client:latest-dev@sha256:a552f9a01603b3db647712ae056e8bb4c04800365707f5bd4abffa05c9e4198e"; }; }; in @@ -151,7 +151,7 @@ in volumes = [ "s3:/data" ]; command = [ "server" "/data" "--console-address" ":9001" ]; healthcheck = { - test = [ "CMD" "curl" "-f" "http://127.0.0.1:9000/minio/health/live" ]; + test = [ "CMD-SHELL" "wget -q -O /dev/null http://127.0.0.1:9000/minio/health/live" ]; interval = "5s"; timeout = "5s"; retries = 12; diff --git a/hosts/hl-minipc1/services/gitea-container.nix b/hosts/hl-minipc1/services/gitea-container.nix index 3aeea4e..08f61d3 100644 --- a/hosts/hl-minipc1/services/gitea-container.nix +++ b/hosts/hl-minipc1/services/gitea-container.nix @@ -49,18 +49,17 @@ in networks.lan.ipv4_address = app.ip; environmentFiles = [ uidEnvFile ]; environment = { - # Same data, same paths as the native service. GITEA_WORK_DIR = gitea.stateDir; GITEA_CUSTOM = "${gitea.stateDir}/custom"; - GITEA_APP_INI = "${gitea.stateDir}/conf/app.ini"; + # The image renames its `git` user to $USER, so this makes RUN_USER, + # sshd AllowUsers and the container's runtime user all `gitea`. + USER = gitea.user; GITEA__server__APP_DATA_PATH = "${gitea.stateDir}/data"; GITEA__server__SSH_ROOT_PATH = "${gitea.stateDir}/.ssh"; GITEA__repository__ROOT = "${gitea.stateDir}/repositories"; GITEA__database__PATH = "${gitea.stateDir}/data/gitea.db"; GITEA__log__ROOT_PATH = "${gitea.stateDir}/log"; - # The container has its own IP, so it serves SSH itself (same keys). - GITEA__server__START_SSH_SERVER = "true"; - GITEA__server__SSH_LISTEN_PORT = toString gitea.sshPort; + GITEA__server__START_SSH_SERVER = "false"; GITEA__server__SSH_PORT = toString gitea.sshPort; GITEA__server__SSH_USER = gitea.user; GITEA__server__DOMAIN = app.effectiveDns; @@ -68,7 +67,10 @@ in GITEA__server__ROOT_URL = "http://${app.effectiveDns}:${toString gitea.httpPort}/"; GITEA__service__DISABLE_REGISTRATION = "true"; }; - volumes = [ "${gitea.stateDir}:${gitea.stateDir}" ]; + volumes = [ + "${gitea.stateDir}:${gitea.stateDir}" + "${gitea.stateDir}/.ssh:/data/git/.ssh" + ]; }; }; } diff --git a/hosts/hl-minipc1/services/gitea.nix b/hosts/hl-minipc1/services/gitea.nix index f9e9cf9..b347c34 100644 --- a/hosts/hl-minipc1/services/gitea.nix +++ b/hosts/hl-minipc1/services/gitea.nix @@ -10,7 +10,7 @@ let in { services.gitea = { - enable = true; + enable = false; appName = "Sosnovsky gitea"; stateDir = gitea.stateDir; user = gitea.user;