danvics/zerobyte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: detect if a custom docker hostname was set before defaulting to zerobyte (#298)

Browse source
This commit is contained in:
Nico 2026-01-05 07:07:35 +01:00 committed by GitHub
parent d293738bf4
commit 21040d7d4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -79,7 +79,7 @@ Zerobyte can be customized using environment variables. Below are the available
| Variable | Description | Default | | Variable | Description | Default |
| :-------------------- | :------------------------------------------------------------------------------------------------------------ | :--------- | | :-------------------- | :------------------------------------------------------------------------------------------------------------ | :--------- |
| `PORT` | The port the web interface and API will listen on. | `4096` | | `PORT` | The port the web interface and API will listen on. | `4096` |
| `RESTIC_HOSTNAME` | The hostname used by Restic when creating snapshots. Useful for identifying which machine a backup came from. | `zerobyte` | | `RESTIC_HOSTNAME` | The hostname used by Restic when creating snapshots. Automatically detected if a custom hostname is set in Docker. | `zerobyte` |
| `LOG_LEVEL` | Logging verbosity. Options: `debug`, `info`, `warn`, `error`. | `info` | | `LOG_LEVEL` | Logging verbosity. Options: `debug`, `info`, `warn`, `error`. | `info` |
| `SERVER_IDLE_TIMEOUT` | Idle timeout for the server in seconds. | `60` | | `SERVER_IDLE_TIMEOUT` | Idle timeout for the server in seconds. | `60` |
| `TZ` | Timezone for the container (e.g., `Europe/Paris`). **Crucial for accurate backup scheduling.** | `UTC` | | `TZ` | Timezone for the container (e.g., `Europe/Paris`). **Crucial for accurate backup scheduling.** | `UTC` |

27
app/server/core/config.ts
View file

@ -1,11 +1,34 @@
import { readFileSync } from "node:fs";
import os from "node:os";
import { type } from "arktype"; import { type } from "arktype";
import "dotenv/config"; import "dotenv/config";
const getResticHostname = () => {
try {
const mountinfo = readFileSync("/proc/self/mountinfo", "utf-8");
const hostnameLine = mountinfo.split("\n").find((line) => line.includes(" /etc/hostname "));
const hostname = os.hostname();
if (hostnameLine) {
const containerIdMatch = hostnameLine.match(/[0-9a-f]{64}/);
const containerId = containerIdMatch ? containerIdMatch[0] : null;
if (containerId?.startsWith(hostname)) {
return "zerobyte";
}
return hostname || "zerobyte";
}
} catch {}
return "zerobyte";
};
const envSchema = type({ const envSchema = type({
NODE_ENV: type.enumerated("development", "production", "test").default("production"), NODE_ENV: type.enumerated("development", "production", "test").default("production"),
SERVER_IP: 'string = "localhost"', SERVER_IP: 'string = "localhost"',
SERVER_IDLE_TIMEOUT: 'string.integer.parse = "60"', SERVER_IDLE_TIMEOUT: 'string.integer.parse = "60"',
RESTIC_HOSTNAME: "string = 'zerobyte'", RESTIC_HOSTNAME: "string?",
PORT: 'string.integer.parse = "4096"', PORT: 'string.integer.parse = "4096"',
MIGRATIONS_PATH: "string?", MIGRATIONS_PATH: "string?",
APP_VERSION: "string = 'dev'", APP_VERSION: "string = 'dev'",
@ -14,7 +37,7 @@ const envSchema = type({
environment: s.NODE_ENV, environment: s.NODE_ENV,
serverIp: s.SERVER_IP, serverIp: s.SERVER_IP,
serverIdleTimeout: s.SERVER_IDLE_TIMEOUT, serverIdleTimeout: s.SERVER_IDLE_TIMEOUT,
resticHostname: s.RESTIC_HOSTNAME, resticHostname: s.RESTIC_HOSTNAME || getResticHostname(),
port: s.PORT, port: s.PORT,
migrationsPath: s.MIGRATIONS_PATH, migrationsPath: s.MIGRATIONS_PATH,
appVersion: s.APP_VERSION, appVersion: s.APP_VERSION,