From 00a4fb4e16e146cd03051a0a032d97b42707b382 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 22 May 2016 15:59:04 +0200
Subject: [PATCH] =?UTF-8?q?docker=20est=20plac=C3=A9=20dans=20une=20expres?=
 =?UTF-8?q?sion=20manuelle=20avec=20activation=20du=20service?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 activation-manuelle/app-docker.nix | 14 ++++++++++++++
 app-adminsys.nix                   |  1 -
 desktop.nix                        |  1 -
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 activation-manuelle/app-docker.nix

diff --git a/activation-manuelle/app-docker.nix b/activation-manuelle/app-docker.nix
new file mode 100644
index 0000000..89ed4e6
--- /dev/null
+++ b/activation-manuelle/app-docker.nix
@@ -0,0 +1,14 @@
+{ config, libs, pkgs, ... }:
+
+{
+  imports = [
+  ];
+
+  environment.systemPackages = with pkgs; [
+    # Ecosystème Docker
+    docker
+    python27Packages.docker_compose
+  ];
+
+  virtualisation.docker.enable = true;
+}
diff --git a/app-adminsys.nix b/app-adminsys.nix
index 343091e..85f5c1d 100644
--- a/app-adminsys.nix
+++ b/app-adminsys.nix
@@ -14,7 +14,6 @@
     powerline-fonts
     powertop
     python27Packages.ansible2
-    python27Packages.docker_compose
     python27Packages.glances
     usbutils
 
diff --git a/desktop.nix b/desktop.nix
index 45aa64e..fbc06a3 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -15,7 +15,6 @@
 
   environment.systemPackages = with pkgs; [
     cowsay
-    docker
     espeak
     gcc # pour les appels depuis les scripts
     gpm