From 38958049f4749e8aad5ac4c354ffb3150fb3a523 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 4 Aug 2016 17:03:35 +0100
Subject: [PATCH 1/2] Remove -f flag from 'docker tag' commands

This flag was deprecated in Docker 1.10 and removed in Docker 1.12.
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e71fb22a..69e0dc59 100644
--- a/Makefile
+++ b/Makefile
@@ -165,10 +165,10 @@ $(RUNNER_EXE): tools/.git
 	make -C tools/runner
 
 $(PUBLISH): publish_%: $(IMAGES_UPTODATE)
-	$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker tag -f $(DOCKERHUB_USER)/$* $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION)
-	$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker push   $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION)
+	$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker tag  $(DOCKERHUB_USER)/$* $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION)
+	$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker push $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION)
 ifneq ($(UPDATE_LATEST),false)
-	$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker push   $(DOCKERHUB_USER)/$*:latest
+	$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker push $(DOCKERHUB_USER)/$*:latest
 endif
 
 publish: $(PUBLISH)

From 0cbf5ca1308718b0ad5385a0ce210ca22eb7fe89 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Mon, 8 Aug 2016 17:20:25 +0100
Subject: [PATCH 2/2] Allow 'weave create-bridge', if the user insists.

For example this is used when setting up CNI for Kubernetes, in
an environment where we know none of the bad consequences apply.
---
 weave | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/weave b/weave
index a5ee0746..193cc4c8 100755
--- a/weave
+++ b/weave
@@ -1933,22 +1933,24 @@ case "$COMMAND" in
     # intentionally undocumented since it assumes knowledge of weave
     # internals
     create-bridge)
-        cat 1>&2 <<EOF
+        if [ "$1" != "--force" ] ; then
+            cat 1>&2 <<EOF
 WARNING: 'weave create-bridge' is deprecated. Instead use 'weave attach-bridge'
 to link the docker and weave bridges after both docker and weave have been
 started. Note that, unlike 'weave create-bridge', 'weave attach-bridge' is
 compatible with fast data path.
 EOF
-        # This subcommand may be run without the docker daemon, but
-        # fastdp needs to run the router container to setup the ODP
-        # bridge, hence:
-        if [ -z "$WEAVE_NO_FASTDP" ] ; then
-            cat 1>&2 <<EOF
+            # This subcommand may be run without the docker daemon, but
+            # fastdp needs to run the router container to setup the ODP
+            # bridge, hence:
+            if [ -z "$WEAVE_NO_FASTDP" ] ; then
+                cat 1>&2 <<EOF
 
 ERROR: 'weave create-bridge' is not compatible with fast data path. If you
 really want to do this please set the WEAVE_NO_FASTDP environment variable.
 EOF
-            exit 1
+                exit 1
+            fi
         fi
         create_bridge --without-ethtool
         ;;