lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

marukuru: migrate to virtualisation.oci-containers

Browse source
This commit is contained in:
Luke Granger-Brown 2020-09-06 16:38:54 +00:00
parent 00a0e1d9ee
commit 7b61a7e558
1 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
ops/nixos/marukuru/default.nix
View file

@ -109,40 +109,42 @@ in {
email = "letsencrypt@lukegb.com"; email = "letsencrypt@lukegb.com";
}; };
docker-containers.heptapod-runner = { virtualisation.oci-containers.containers = {
image = "octobus/heptapod-runner:0.2.0"; heptapod-runner = {
volumes = [ image = "octobus/heptapod-runner:0.2.0";
"/srv/gitlab-runner/config:/etc/gitlab-runner" volumes = [
"/var/run/docker.sock:/var/run/docker.sock" "/srv/gitlab-runner/config:/etc/gitlab-runner"
]; "/var/run/docker.sock:/var/run/docker.sock"
}; ];
docker-containers.heptapod = { };
#image = "octobus/heptapod:0.13.0-py3"; heptapod = {
image = "heptapod:latest"; #image = "octobus/heptapod:0.13.0-py3";
ports = [ image = "heptapod:latest";
# host:container ports = [
"22:22" # host:container
"80:80" "22:22"
"443:443" "80:80"
]; "443:443"
volumes = [ ];
"/srv/gitlab/config:/etc/gitlab" volumes = [
"/srv/gitlab/logs:/var/log/gitlab" "/srv/gitlab/config:/etc/gitlab"
"/srv/gitlab/data:/var/opt/gitlab" "/srv/gitlab/logs:/var/log/gitlab"
]; "/srv/gitlab/data:/var/opt/gitlab"
environment = { ];
GITLAB_OMNIBUS_CONFIG = builtins.replaceStrings ["\n"] [";"] '' environment = {
external_url "https://hg.lukegb.com" GITLAB_OMNIBUS_CONFIG = builtins.replaceStrings ["\n"] [";"] ''
letsencrypt['enable'] = true external_url "https://hg.lukegb.com"
letsencrypt['contact_emails'] = ['letsencrypt@lukegb.com'] letsencrypt['enable'] = true
nginx['redirect_http_to_https'] = true letsencrypt['contact_emails'] = ['letsencrypt@lukegb.com']
nginx['redirect_http_to_https'] = true
gitlab_rails['smtp_enable'] = true gitlab_rails['smtp_enable'] = true
gitlab_rails['smtp_address'] = '103.105.48.15' gitlab_rails['smtp_address'] = '103.105.48.15'
gitlab_rails['smtp_port'] = 25 gitlab_rails['smtp_port'] = 25
gitlab_rails['gitlab_email_from'] = 'heptapod@hg.lukegb.com' gitlab_rails['gitlab_email_from'] = 'heptapod@hg.lukegb.com'
gitlab_rails['gitlab_email_reply_to'] = 'noreply@hg.lukegb.com' gitlab_rails['gitlab_email_reply_to'] = 'noreply@hg.lukegb.com'
''; '';
};
}; };
}; };
@ -201,4 +203,4 @@ in {
}; };
system.stateVersion = "20.03"; system.stateVersion = "20.03";
} }