Merge pull request #167 from nicolasbock/docker_command

Add option to specify the `docker` command

Author: nicolasbock

ebuildtester/docker.py

@@ -44,7 +44,7 @@ def execute(self, cmd):
         """
 
         options.log.info("%s %s" % (self.cid[:6], cmd))
-        docker_cmd = ["docker", "exec", "--interactive"]
+        docker_cmd = [options.options.docker_command, "exec", "--interactive"]
         docker_cmd += [self.cid, "/bin/bash"]
         docker = subprocess.Popen(docker_cmd,
                                   stdout=subprocess.PIPE,

ebuildtester/parse.py

@@ -1,4 +1,5 @@
 from ebuildtester.atom import Atom
+import os
 from pkg_resources import get_distribution
 import argparse
 import multiprocessing
@@ -111,6 +112,9 @@ def parse_commandline(args):
         "--docker-image",
         help="Specify the docker image to use (default = %(default)s)",
         default="gentoo/stage3")
+    parser.add_argument(
+        "--docker-command",
+        help="Specify the docker command")
     parser.add_argument(
         "--pull",
         help="Download latest docker image",
@@ -139,4 +143,7 @@ def parse_commandline(args):
     else:
         options.update = False
 
+    if not options.docker_command:
+        options.docker_command = os.getenv('DOCKER_COMMAND', default='docker')
+
     return options

snap/snapcraft.yaml

@@ -9,9 +9,22 @@ description: |
 grade: stable
 confinement: strict
 
+environment:
+  DOCKER_COMMAND: docker-wrapper.sh
+
+plugs:
+  docker-executables:
+    interface: content
+    target: $SNAP/docker-snap
+    default-provider: docker
+
 apps:
   ebuildtester:
     command: bin/ebuildtester
+  confinement:
+    command: usr/bin/confinement.sh
+  docker:
+    command: usr/bin/docker-wrapper.sh
     plugs:
       - docker
 
@@ -23,3 +36,9 @@ parts:
     source-tag: v0.1.30
     requirements:
       - requirements.txt
+  docker-wrapper:
+    plugin: dump
+    source: .
+    organize:
+      confinement.sh: usr/bin/confinement.sh
+      docker-wrapper.sh: /usr/bin/docker-wrapper.sh