rarias/jungle
2
0
Fork 3
Code Issues 58 Pull Requests 7 Actions Packages Projects Releases Wiki Activity

MERGEME: Use docker extra hosts

Browse Source
This commit is contained in:
Rodrigo Arias
2025-02-17 14:28:03 +01:00
parent c9f1712986
commit 3f4e282113
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
m/hut/gitlab-runner.nix
View File

@@ -39,9 +39,10 @@
# gitlab.bsc.es still uses the old token mechanism # gitlab.bsc.es still uses the old token mechanism
registrationConfigFile = config.age.secrets.gitlab-bsc-docker.path; registrationConfigFile = config.age.secrets.gitlab-bsc-docker.path;
environmentVariables = { environmentVariables = {
# We don't have hut in hosts yet... # We cannot access the hut local interface from docker, so we connect
https_proxy = "http://10.0.40.7:23080"; # to hut directly via the ethernet one.
http_proxy = "http://10.0.40.7:23080"; https_proxy = "http://hut:23080";
http_proxy = "http://hut:23080";
}; };
executor = "docker"; executor = "docker";
dockerImage = "alpine"; dockerImage = "alpine";
@@ -50,6 +51,10 @@
"/nix/var/nix/db:/nix/var/nix/db:ro" "/nix/var/nix/db:/nix/var/nix/db:ro"
"/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
]; ];
dockerExtraHosts = [
# Required to pass the proxy via hut
"hut:10.0.40.7"
];
dockerDisableCache = true; dockerDisableCache = true;
preBuildScript = pkgs.writeScript "setup-container" '' preBuildScript = pkgs.writeScript "setup-container" ''
mkdir -p -m 0755 /nix/var/log/nix/drvs mkdir -p -m 0755 /nix/var/log/nix/drvs
@@ -62,7 +67,6 @@
mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root
mkdir -p -m 0700 "$HOME/.nix-defexpr" mkdir -p -m 0700 "$HOME/.nix-defexpr"
mkdir -p -m 0700 "$HOME/.ssh" mkdir -p -m 0700 "$HOME/.ssh"
echo "10.0.40.7 hut" >> /etc/hosts
cat > "$HOME/.ssh/config" << EOF cat > "$HOME/.ssh/config" << EOF
Host bscpm03.bsc.es gitlab-internal.bsc.es Host bscpm03.bsc.es gitlab-internal.bsc.es
User git User git