From e11178e639bba6fceaf134bf43b0f131f56fa7ca Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 2 Dec 2014 12:21:56 -0800 Subject: [PATCH] app-emulation/docker: add --insecure-registry flag This is a temporary workaround to allow people to transistion into 1.3+ smoothly. This sets --insecure-registry=0.0.0.0/0 to maintain backward compatibility. --- .../docker/{docker-1.3.3.ebuild => docker-1.3.3-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/files/docker.service | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.3.3.ebuild => docker-1.3.3-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.3-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.3-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service index a81e8f156e..275f63557e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service @@ -7,10 +7,11 @@ Requires=docker.socket early-docker.target [Service] Environment=TMPDIR=/var/tmp Environment=DOCKER_DRIVER=btrfs -ExecStartPre=/bin/mount --make-rprivate / +Environment=DOCKER_OPTS='--insecure-registry="0.0.0.0/0"' EnvironmentFile=-/run/docker_opts.env LimitNOFILE=1048576 LimitNPROC=1048576 +ExecStartPre=/bin/mount --make-rprivate / # Run docker but don't have docker automatically restart # containers. This is a job for systemd and unit files. ExecStart=/usr/bin/docker --daemon --host=fd:// $DOCKER_OPTS