Protobuf fixes

duedil-ltd · Nov 1, 2014 · c2b5a17 · c2b5a17
1 parent 1ab16d3
commit c2b5a17
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 27 deletions.
diff --git a/portainer/app/executor.py b/portainer/app/executor.py
@@ -74,9 +74,8 @@ def launch_docker_daemon():
                 os.path.join(env["MESOS_DIRECTORY"], "docker")
             )
 
-            if build_task.daemon.HasField("insecure_registries"):
-                for reg in build_task.daemon.insecure_registries:
-                    env["DOCKER_DAEMON_ARGS"] += " --insecure-registry %s" % reg
+            for reg in build_task.daemon.insecure_registries:
+                env["DOCKER_DAEMON_ARGS"] += " --insecure-registry %s" % reg
 
             # Use the `wrapdocker` script included in our docker image
             proc = subprocess.Popen(["/usr/local/bin/wrapdocker"], env=env)

diff --git a/portainer/app/scheduler.py b/portainer/app/scheduler.py
@@ -316,7 +316,7 @@ def handle_exception(e):
         if self.insecure_registries:
             for registry in [self.pull_registry, self.push_registry]:
                 if registry:
-                    build_task.daemon.insecure_registries.add(registry)
+                    build_task.daemon.insecure_registries.append(registry)
 
         # Pull out the repository from the dockerfile
         try:

diff --git a/portainer/proto/portainer_pb2.py b/portainer/proto/portainer_pb2.py