From fed3501b0722e187284f9f6e1532f5b6e0572d6e Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Fri, 9 Sep 2016 18:50:15 +0200 Subject: Remove docker-registry as it's deprecated #18209 --- nixos/modules/misc/ids.nix | 2 - nixos/modules/module-list.nix | 2 - nixos/modules/services/misc/docker-registry.nix | 81 ------------------ .../services/networking/docker-registry-server.nix | 98 ---------------------- 4 files changed, 183 deletions(-) delete mode 100644 nixos/modules/services/misc/docker-registry.nix delete mode 100644 nixos/modules/services/networking/docker-registry-server.nix (limited to 'nixos/modules') diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 31c93028bc52..d406cbf9c015 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -181,7 +181,6 @@ systemd-timesync = 154; liquidsoap = 155; etcd = 156; - docker-registry = 157; hbase = 158; opentsdb = 159; scollector = 160; @@ -436,7 +435,6 @@ systemd-timesync = 154; liquidsoap = 155; #etcd = 156; # unused - #docker-registry = 157; # unused hbase = 158; opentsdb = 159; scollector = 160; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c6eec6adb3b7..4ce39555133d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -229,7 +229,6 @@ ./services/misc/dictd.nix ./services/misc/dysnomia.nix ./services/misc/disnix.nix - ./services/misc/docker-registry.nix ./services/misc/emby.nix ./services/misc/etcd.nix ./services/misc/felix.nix @@ -333,7 +332,6 @@ ./services/networking/dnschain.nix ./services/networking/dnscrypt-proxy.nix ./services/networking/dnsmasq.nix - ./services/networking/docker-registry-server.nix ./services/networking/ejabberd.nix ./services/networking/fan.nix ./services/networking/ferm.nix diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix deleted file mode 100644 index add339f9bdfe..000000000000 --- a/nixos/modules/services/misc/docker-registry.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.dockerRegistry; - -in { - ###### interface - - options.services.dockerRegistry = { - enable = mkOption { - description = "Whether to enable docker registry server."; - default = false; - type = types.bool; - }; - - listenAddress = mkOption { - description = "Docker registry host or ip to bind to."; - default = "127.0.0.1"; - type = types.str; - }; - - port = mkOption { - description = "Docker registry port to bind to."; - default = 5000; - type = types.int; - }; - - storagePath = mkOption { - type = types.path; - default = "/var/lib/docker-registry"; - description = "Docker registry storage path."; - }; - - extraConfig = mkOption { - description = '' - Docker extra registry configuration. See - - ''; - default = {}; - type = types.attrsOf types.str; - }; - }; - - config = mkIf cfg.enable { - systemd.services.docker-registry = { - description = "Docker Container Registry"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - environment = { - REGISTRY_HOST = cfg.listenAddress; - REGISTRY_PORT = toString cfg.port; - GUNICORN_OPTS = "[--preload]"; # see https://github.com/docker/docker-registry#sqlalchemy - STORAGE_PATH = cfg.storagePath; - } // cfg.extraConfig; - - serviceConfig = { - ExecStart = "${pkgs.pythonPackages.docker_registry}/bin/docker-registry"; - User = "docker-registry"; - Group = "docker"; - PermissionsStartOnly = true; - WorkingDirectory = cfg.storagePath; - }; - - postStart = '' - until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/'; do - sleep 1; - done - ''; - }; - - users.extraGroups.docker.gid = mkDefault config.ids.gids.docker; - users.extraUsers.docker-registry = { - createHome = true; - home = cfg.storagePath; - uid = config.ids.uids.docker-registry; - }; - }; -} diff --git a/nixos/modules/services/networking/docker-registry-server.nix b/nixos/modules/services/networking/docker-registry-server.nix deleted file mode 100644 index d21bbb6a86c3..000000000000 --- a/nixos/modules/services/networking/docker-registry-server.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.nodeDockerRegistry; - -in { - options.services.nodeDockerRegistry = { - enable = mkEnableOption "docker registry service"; - - port = mkOption { - description = "Docker registry listening port."; - default = 8080; - type = types.int; - }; - - users = mkOption { - description = "Docker registry list of users."; - default = []; - options = [{ - user = mkOption { - description = "Docker registry user username."; - type = types.str; - }; - - pass = mkOption { - description = "Docker registry user password."; - type = types.str; - }; - }]; - type = types.listOf types.optionSet; - }; - - onTag = mkOption { - description = "Docker registry hook triggered when an image is tagged."; - default = ""; - type = types.str; - }; - - onImage = mkOption { - description = "Docker registry hook triggered when an image metadata is uploaded."; - default = ""; - type = types.str; - }; - - onLayer = mkOption { - description = "Docker registry hook triggered when an when an image layer is uploaded."; - default = ""; - type = types.str; - }; - - onVerify = mkOption { - description = "Docker registry hook triggered when an image layer+metadata has been verified."; - default = ""; - type = types.str; - }; - - onIndex = mkOption { - description = "Docker registry hook triggered when an when an image file system data has been indexed."; - default = ""; - type = types.str; - }; - - dataDir = mkOption { - description = "Docker registry data directory"; - default = "/var/lib/docker-registry"; - type = types.path; - }; - }; - - config = mkIf cfg.enable { - systemd.services.docker-registry-server = { - description = "Docker Registry Service."; - wantedBy = ["multi-user.target"]; - after = ["network.target"]; - script = '' - ${pkgs.nodePackages.docker-registry-server}/bin/docker-registry-server \ - --dir ${cfg.dataDir} \ - --port ${toString cfg.port} \ - ${concatMapStringsSep " " (u: "--user ${u.user}:${u.pass}") cfg.users} \ - ${optionalString (cfg.onTag != "") "--on-tag '${cfg.onTag}'"} \ - ${optionalString (cfg.onImage != "") "--on-image '${cfg.onImage}'"} \ - ${optionalString (cfg.onVerify != "") "--on-verify '${cfg.onVerify}'"} \ - ${optionalString (cfg.onIndex != "") "--on-index '${cfg.onIndex}'"} - ''; - - serviceConfig.User = "docker-registry"; - }; - - users.extraUsers.docker-registry = { - uid = config.ids.uids.docker-registry; - description = "Docker registry user"; - createHome = true; - home = cfg.dataDir; - }; - }; -} -- cgit 1.4.1