Skip to content

Commit

Permalink
Merge pull request #292 from barrucadu/concourse-containerd
Browse files Browse the repository at this point in the history
Switch concourse to containerd runtime & drop cgroupsv1
  • Loading branch information
barrucadu authored Jul 30, 2024
2 parents 901b3c1 + 31f4e14 commit e50e010
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
7 changes: 2 additions & 5 deletions shared/concourse/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ in
];

config = mkIf cfg.enable {
# https://github.com/concourse/concourse/discussions/6529
boot.kernelParams = [ "systemd.unified_cgroup_hierarchy=0" ];

nixfiles.oci-containers.pods.concourse = {
containers = {
web = {
Expand All @@ -38,7 +35,6 @@ in
"CONCOURSE_EXTERNAL_URL" = "https://cd.barrucadu.dev";
"CONCOURSE_MAIN_TEAM_GITHUB_USER" = cfg.githubUser;
"CONCOURSE_LOG_LEVEL" = "error";
"CONCOURSE_GARDEN_LOG_LEVEL" = "error";
"CONCOURSE_PROMETHEUS_BIND_IP" = "0.0.0.0";
"CONCOURSE_PROMETHEUS_BIND_PORT" = "8088";
"CONCOURSE_BAGGAGECLAIM_RESPONSE_HEADER_TIMEOUT" = "30m";
Expand All @@ -57,8 +53,9 @@ in
cmd = [ "worker" "--ephemeral" ];
environment = {
"CONCOURSE_TSA_HOST" = "concourse-web:2222";
"CONCOURSE_RUNTIME" = "containerd";
"CONCOURSE_CONTAINERD_DNS_PROXY_ENABLE" = "false";
"CONCOURSE_GARDEN_DNS_SERVER" = "1.1.1.1,8.8.8.8";
"CONCOURSE_CONTAINERD_DNS_SERVER" = "1.1.1.1,8.8.8.8";
"CONCOURSE_WORK_DIR" = mkIf (cfg.workerScratchDir != null) "/workdir";
};
extraOptions = [ "--privileged" ];
Expand Down
2 changes: 1 addition & 1 deletion shared/concourse/options.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ with lib;

concourseTag = mkOption {
type = types.str;
default = "7.8.2";
default = "7.11.2";
description = mdDoc ''
Tag to use of the `concourse/concourse` container image.
'';
Expand Down

0 comments on commit e50e010

Please sign in to comment.