Move gitlab configuration to a networked-docker-container
This commit is contained in:
parent
7266dd3bfa
commit
5b5f922354
|
@ -12,6 +12,7 @@
|
|||
# and set inside the docker-containers set, instead of setting the
|
||||
# docker-containers set here.
|
||||
./services/nginx.nix
|
||||
./services/gitlab.nix
|
||||
];
|
||||
|
||||
networking = {
|
||||
|
@ -63,12 +64,5 @@
|
|||
autoPrune.enable = true;
|
||||
};
|
||||
|
||||
docker-containers = {
|
||||
## Actual service definitions
|
||||
gitlab = import ./services/gitlab.nix;
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
system.stateVersion = "19.09";
|
||||
}
|
||||
|
|
|
@ -1,21 +1,25 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
image = "gitlab/gitlab-ce:latest";
|
||||
ports = [
|
||||
"3022:22"
|
||||
];
|
||||
volumes = [
|
||||
"gitlab-data:/var/opt/gitlab:Z"
|
||||
"gitlab-logs:/var/log/gitlab:Z"
|
||||
"gitlab-config:/etc/gitlab:Z"
|
||||
];
|
||||
environment = {
|
||||
VIRTUAL_HOST = "gitlab.tlater.net";
|
||||
LETSENCRYPT_HOST = "gitlab.tlater.net";
|
||||
GITLAB_OMNIBUS_CONFIG = builtins.replaceStrings [ "\n" ] [ "" ] (builtins.readFile ./configs/gitlab.rb);
|
||||
networked-docker-containers = {
|
||||
gitlab = {
|
||||
image = "gitlab/gitlab-ce:latest";
|
||||
ports = [
|
||||
"3022:22"
|
||||
];
|
||||
volumes = [
|
||||
"gitlab-data:/var/opt/gitlab:Z"
|
||||
"gitlab-logs:/var/log/gitlab:Z"
|
||||
"gitlab-config:/etc/gitlab:Z"
|
||||
];
|
||||
environment = {
|
||||
VIRTUAL_HOST = "gitlab.tlater.net";
|
||||
LETSENCRYPT_HOST = "gitlab.tlater.net";
|
||||
GITLAB_OMNIBUS_CONFIG = builtins.replaceStrings [ "\n" ] [ "" ] (builtins.readFile ./configs/gitlab.rb);
|
||||
};
|
||||
networks = [
|
||||
"webproxy"
|
||||
];
|
||||
};
|
||||
};
|
||||
extraDockerOptions = [
|
||||
"--network=webproxy"
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue