From 66230c5efc3a2c61ffa077570a1648f3b6fc5f82 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Mon, 27 Dec 2021 19:47:56 +0100 Subject: [PATCH] Goodbye docker --- .drone.yml | 1 - modules/drone/default.nix | 23 +---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/.drone.yml b/.drone.yml index 592ab8f..09b3b50 100644 --- a/.drone.yml +++ b/.drone.yml @@ -146,4 +146,3 @@ trigger: event: - pull_request - cron - - push diff --git a/modules/drone/default.nix b/modules/drone/default.nix index ac839e5..a8a4beb 100644 --- a/modules/drone/default.nix +++ b/modules/drone/default.nix @@ -18,14 +18,10 @@ in config = mkIf cfg.enable ( mkMerge [{ - luj.hmgr.droneserver.luj.programs.git.enable = true; - users.groups.docker = {}; sops.secrets.drone = { }; nix.allowedUsers = [ "droneserver"]; - virtualisation.docker.enable = true; - systemd.services.drone-server = { wantedBy = [ "multi-user.target" ]; serviceConfig = { @@ -82,24 +78,7 @@ in path = [ pkgs.nixUnstable pkgs.git pkgs.docker pkgs.docker-compose pkgs.openssh ]; }; - systemd.services.drone-runner-docker = { - description = "Drone Docker Runner"; - startLimitIntervalSec = 5; - serviceConfig = { - EnvironmentFile = [ config.sops.secrets.drone.path ]; - Environment = [ - "DRONE_SERVER_HOST=${cfg.nginx.subdomain}.julienmalka.me" - "DRONE_SERVER_PROTO=https" - "CLIENT_DRONE_RPC_HOST=127.0.0.1:3030" - ]; - - ExecStart = "${pkgs.drone-runner-docker}/bin/drone-runner-docker"; - }; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.nixUnstable pkgs.git pkgs.docker pkgs.docker-compose pkgs.openssh ]; - }; - - + }