tlaternet/tlaternet-server
1
0
Fork 0
Code Issues 9 Pull requests Releases Activity

Move gitlab configuration to a networked-docker-container

Browse source
This commit is contained in:
Tristan Daniël Maat 2020-02-08 21:29:30 +09:00
parent 7266dd3bfa
commit 5b5f922354
Signed by: tlater
GPG key ID: 49670FD774E43268
2 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
etc/nixos/configuration.nix
View file

@ -12,6 +12,7 @@
# and set inside the docker-containers set, instead of setting the # and set inside the docker-containers set, instead of setting the
# docker-containers set here. # docker-containers set here.
./services/nginx.nix ./services/nginx.nix
./services/gitlab.nix
]; ];
networking = { networking = {
@ -63,12 +64,5 @@
autoPrune.enable = true; autoPrune.enable = true;
}; };
docker-containers = {
## Actual service definitions
gitlab = import ./services/gitlab.nix;
};
};
system.stateVersion = "19.09"; system.stateVersion = "19.09";
} }

8
etc/nixos/services/gitlab.nix
View file

@ -1,6 +1,8 @@
{ ... }: { ... }:
{ {
networked-docker-containers = {
gitlab = {
image = "gitlab/gitlab-ce:latest"; image = "gitlab/gitlab-ce:latest";
ports = [ ports = [
"3022:22" "3022:22"
@ -15,7 +17,9 @@
LETSENCRYPT_HOST = "gitlab.tlater.net"; LETSENCRYPT_HOST = "gitlab.tlater.net";
GITLAB_OMNIBUS_CONFIG = builtins.replaceStrings [ "\n" ] [ "" ] (builtins.readFile ./configs/gitlab.rb); GITLAB_OMNIBUS_CONFIG = builtins.replaceStrings [ "\n" ] [ "" ] (builtins.readFile ./configs/gitlab.rb);
}; };
extraDockerOptions = [ networks = [
"--network=webproxy" "webproxy"
]; ];
};
};
} }