From b60a3cca45e9af8bb9702457a93ca61c2835c56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Meireles?= Date: Tue, 17 Mar 2015 15:25:59 +0000 Subject: [PATCH] workaround for docker/docker-registry#892 /crasher on CoreOS' cloud-configs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit avoids race conditions (docker/docker-registry#892) when multiple workers are attempting to run sql migrations simultaneously. dunno why this isn't the registry's default since this isn't specially hard to trigger so we're just playing safe here. Signed-off-by: António Meireles --- docs/getting-started-guides/aws/cloud-configs/master.yaml | 3 +++ docs/getting-started-guides/coreos/cloud-configs/master.yaml | 3 +++ .../coreos/cloud-configs/standalone.yaml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/docs/getting-started-guides/aws/cloud-configs/master.yaml b/docs/getting-started-guides/aws/cloud-configs/master.yaml index 72613a4ed25..e7e903e5e9d 100644 --- a/docs/getting-started-guides/aws/cloud-configs/master.yaml +++ b/docs/getting-started-guides/aws/cloud-configs/master.yaml @@ -100,8 +100,11 @@ coreos: ExecStartPre=-/usr/bin/docker kill docker-registry ExecStartPre=-/usr/bin/docker rm docker-registry ExecStartPre=/usr/bin/docker pull quay.io/devops/docker-registry:latest + # GUNICORN_OPTS is an workaround for + # https://github.com/docker/docker-registry/issues/892 ExecStart=/usr/bin/docker run --rm --net host --name docker-registry \ -e STANDALONE=false \ + -e GUNICORN_OPTS=[--preload] \ -e MIRROR_SOURCE=https://registry-1.docker.io \ -e MIRROR_SOURCE_INDEX=https://index.docker.io \ -e MIRROR_TAGS_CACHE_TTL=1800 \ diff --git a/docs/getting-started-guides/coreos/cloud-configs/master.yaml b/docs/getting-started-guides/coreos/cloud-configs/master.yaml index 25fd8cee24d..5bb9297b660 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/master.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/master.yaml @@ -102,8 +102,11 @@ coreos: ExecStartPre=-/usr/bin/docker kill docker-registry ExecStartPre=-/usr/bin/docker rm docker-registry ExecStartPre=/usr/bin/docker pull quay.io/devops/docker-registry:latest + # GUNICORN_OPTS is an workaround for + # https://github.com/docker/docker-registry/issues/892 ExecStart=/usr/bin/docker run --rm --net host --name docker-registry \ -e STANDALONE=false \ + -e GUNICORN_OPTS=[--preload] \ -e MIRROR_SOURCE=https://registry-1.docker.io \ -e MIRROR_SOURCE_INDEX=https://index.docker.io \ -e MIRROR_TAGS_CACHE_TTL=1800 \ diff --git a/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml b/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml index e267e640bde..4a9e4e0fabc 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml @@ -63,8 +63,11 @@ coreos: ExecStartPre=-/usr/bin/docker kill docker-registry ExecStartPre=-/usr/bin/docker rm docker-registry ExecStartPre=/usr/bin/docker pull quay.io/devops/docker-registry:latest + # GUNICORN_OPTS is an workaround for + # https://github.com/docker/docker-registry/issues/892 ExecStart=/usr/bin/docker run --rm --net host --name docker-registry \ -e STANDALONE=false \ + -e GUNICORN_OPTS=[--preload] \ -e MIRROR_SOURCE=https://registry-1.docker.io \ -e MIRROR_SOURCE_INDEX=https://index.docker.io \ -e MIRROR_TAGS_CACHE_TTL=1800 \