docker: use nobranch

The upstream repository has both removed tags and
renamed branches.

To prevent some of these failures in the future,
let's run with nobranch=1 for a bit.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 41 insertions, 2 deletions

diff --git a/recipes-containers/docker/README.rootless b/recipes-containers/docker/README.rootless
new file mode 100644
index 00000000..973d72e9
--- /dev/null
+++ b/recipes-containers/docker/README.rootless
@@ -0,0 +1,39 @@
+    1  docker pull alpine
+    2  cd /var/lib/containers/storage/
+    3  ll
+    4  ls
+    5  ls -alF
+    6  ls overlay
+    7  ls overlay/
+    8  ls overlay/d4fc045c9e3a848011de66f34b81f052d4f2c15a17bb196d637e526349601820/
+    9  ll
+   10  ls -alF
+   11  cd ..
+   12  ls -alF
+   13  ls cache/
+   14  cd storage/
+   15  ll
+   16  ls alF
+   17  ls -alF
+   18  ls
+   19  cd
+   20  skopeo
+   21  ls /var/lib/docker/
+   22  ls /var/lib/docker/
+   23  cd /var/lib/docker/
+   24  ll
+   25  alias ll="ls -alF"
+   26  ll
+   27  ls containers/
+   28  ls overlay2/
+   29  skopeo --help
+   30  skopeo copy
+   31  docker images
+   32  cd
+   33  skopeo copy docker-daemon:alpine oci:alpine
+   34  skopeo copy docker-daemon:alpine:latest oci:alpine
+   35  ls alpine/
+   36  skopeo copy oci:alpine  docker-daemon:bruce:latest
+   37  docker images
+   38  docker run -it bruce /bin/sh
+
diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb
index b4576de9..1b74bd80 100644
--- a/recipes-containers/docker/docker-moby_git.bb
+++ b/recipes-containers/docker/docker-moby_git.bb
@@ -49,9 +49,9 @@ SRCREV_libnetwork = "67e0588f1ddfaf2faf4c8cae8b7ea2876434d91c"
 SRCREV_cli = "d41cb083c352853f94b292a87df4859c4a96dcc2"
 SRCREV_FORMAT = "moby_libnetwork"
 SRC_URI = "\
-        git://github.com/moby/moby.git;branch=27.0;name=moby;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
+        git://github.com/moby/moby.git;nobranch=1;name=moby;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
         git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork;protocol=https \
-        git://github.com/docker/cli;branch=27.0;name=cli;destsuffix=git/cli;protocol=https \
+        git://github.com/docker/cli;nobranch=1;name=cli;destsuffix=git/cli;protocol=https \
         file://docker.init \
         file://0001-libnetwork-use-GO-instead-of-go.patch \
         file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \