christoph/flake-nixinator
1
Fork 0
Code Activity

Compare commits

base: christoph:0cc5dcef92c1a0fa5332ae6f9b36caf74d275305
Branches Tags
christoph:master
...
compare: christoph:961d5f430ff2de8ed32c13f58bf5c9ea0a99a525
Branches Tags
christoph:master

2 Commits
0cc5dcef92 ... 961d5f430f

Author SHA1 Message Date
Christoph Urlacher
961d5f430f Services/Gitea: Update to v1.24.2 2025-07-11 21:15:24 +02:00
Christoph Urlacher
674e945d7e Services/GiteaRunner: Update to v0.2.12 2025-07-11 21:15:16 +02:00
2 changed files with 117 additions and 109 deletions
Expand all files Collapse all files

80
system/services/gitea-runner.nix
View File

@ -3,46 +3,50 @@
lib, lib,
pkgs, pkgs,
... ...
}: { }: let
virtualisation.oci-containers.containers.gitea-runner = { runnerVersion = "0.2.12";
image = "gitea/act_runner:latest"; # NOTE: vegardit has other runner images in {
autoStart = true; virtualisation.oci-containers.containers = {
gitea-runner = {
image = "gitea/act_runner:${runnerVersion}"; # NOTE: vegardit has other runner images
autoStart = true;
login = { login = {
# Uses DockerHub by default # Uses DockerHub by default
# registry = ""; # registry = "";
# DockerHub Credentials # DockerHub Credentials
username = "christoph.urlacher@protonmail.com"; username = "christoph.urlacher@protonmail.com";
passwordFile = "${config.sops.secrets.docker-password.path}"; passwordFile = "${config.sops.secrets.docker-password.path}";
};
dependsOn = [];
ports = [];
volumes = [
"gitea-runner_data:/data"
"gitea-runner_config:/config" # Managed by env variables for vegardit image
"/var/run/docker.sock:/var/run/docker.sock" # Disable for dind
];
environment = {
# gitlab.local.chriphost.de doesn't work, because it gets resolved to 192.168.86.25:443, which is nginx
GITEA_INSTANCE_URL = "http://192.168.86.25:3000";
GITEA_RUNNER_NAME = "servenix";
# Can be generated from inside the container using act_runner generate-config > /config/config.yaml
CONFIG_FILE = "/config/config.yaml";
# This token is invalid, when re-registering is needed it has to be refreshed
GITEA_RUNNER_REGISTRATION_TOKEN = "Mq6wr0dPthqDij3iaryP8s5VYZA5kPfOQbHA6wm6";
};
extraOptions = [
# "--privileged" # Enable for dind
"--net=behind-nginx"
];
}; };
dependsOn = [];
ports = [];
volumes = [
"gitea-runner_data:/data"
"gitea-runner_config:/config" # Managed by env variables for vegardit image
"/var/run/docker.sock:/var/run/docker.sock" # Disable for dind
];
environment = {
# NOTE: gitlab.local.chriphost.de doesn't work, because it gets resolved to 192.168.86.25:443, which is nginx
GITEA_INSTANCE_URL = "http://192.168.86.25:3000";
GITEA_RUNNER_NAME = "servenix";
# Can be generated from inside the container using act_runner generate-config > /config/config.yaml
CONFIG_FILE = "/config/config.yaml";
# NOTE: This token is invalid, when re-registering is needed it has to be refreshed
GITEA_RUNNER_REGISTRATION_TOKEN = "Mq6wr0dPthqDij3iaryP8s5VYZA5kPfOQbHA6wm6";
};
extraOptions = [
# "--privileged" # Enable for dind
"--net=behind-nginx"
];
}; };
} }

146
system/services/gitea.nix
View File

@ -3,7 +3,9 @@
lib, lib,
pkgs, pkgs,
... ...
}: { }: let
giteaVersion = "1.24.2";
in {
users = { users = {
groups.git = {}; groups.git = {};
@ -19,83 +21,85 @@
}; };
}; };
virtualisation.oci-containers.containers.gitea-db = { virtualisation.oci-containers.containers = {
image = "postgres:14"; gitea-db = {
autoStart = true; image = "postgres:14";
autoStart = true;
login = { login = {
# Uses DockerHub by default # Uses DockerHub by default
# registry = ""; # registry = "";
# DockerHub Credentials # DockerHub Credentials
username = "christoph.urlacher@protonmail.com"; username = "christoph.urlacher@protonmail.com";
passwordFile = "${config.sops.secrets.docker-password.path}"; passwordFile = "${config.sops.secrets.docker-password.path}";
};
dependsOn = [];
ports = [];
volumes = [
"gitea-db_data:/var/lib/postgresql/data"
];
environment = {
POSTGRES_USER = "gitea";
POSTGRES_PASSWORD = "gitea";
POSTGRES_DB = "gitea";
};
extraOptions = [
"--net=behind-nginx"
];
}; };
dependsOn = []; gitea = {
image = "gitea/gitea:${giteaVersion}";
autoStart = true;
ports = []; login = {
# Uses DockerHub by default
# registry = "";
volumes = [ # DockerHub Credentials
"gitea-db_data:/var/lib/postgresql/data" username = "christoph.urlacher@protonmail.com";
]; passwordFile = "${config.sops.secrets.docker-password.path}";
};
environment = { dependsOn = [
POSTGRES_USER = "gitea"; "gitea-db"
POSTGRES_PASSWORD = "gitea"; ];
POSTGRES_DB = "gitea";
ports = [
"3000:3000"
# NOTE: Set .git/config url to ssh://christoph@gitea.local.chriphost.de:222/christoph/<repo>.git
"222:222" # Gitea SSH
];
volumes = [
"/etc/timezone:/etc/timezone:ro"
"/etc/localtime:/etc/localtime:ro"
"gitea_data:/data"
];
environment = {
USER = "git";
USER_UID = "500";
# USER_GID = "100";
GITEA__database__DB_TYPE = "postgres";
GITEA__database__HOST = "gitea-db:5432";
GITEA__database__NAME = "gitea";
GITEA__database__USER = "gitea";
GITEA__database__PASSWD = "gitea";
};
extraOptions = [
"--net=behind-nginx"
];
}; };
extraOptions = [
"--net=behind-nginx"
];
};
virtualisation.oci-containers.containers.gitea = {
image = "gitea/gitea:latest";
autoStart = true;
login = {
# Uses DockerHub by default
# registry = "";
# DockerHub Credentials
username = "christoph.urlacher@protonmail.com";
passwordFile = "${config.sops.secrets.docker-password.path}";
};
dependsOn = [
"gitea-db"
];
ports = [
"3000:3000"
# NOTE: Set .git/config url to ssh://christoph@gitea.local.chriphost.de:222/christoph/<repo>.git
"222:222" # Gitea SSH
];
volumes = [
"/etc/timezone:/etc/timezone:ro"
"/etc/localtime:/etc/localtime:ro"
"gitea_data:/data"
];
environment = {
USER = "git";
USER_UID = "500";
# USER_GID = "100";
GITEA__database__DB_TYPE = "postgres";
GITEA__database__HOST = "gitea-db:5432";
GITEA__database__NAME = "gitea";
GITEA__database__USER = "gitea";
GITEA__database__PASSWD = "gitea";
};
extraOptions = [
"--net=behind-nginx"
];
}; };
} }