From 83a2041edfc76ef5fa6814feddb5198d172fc452 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Fri, 7 Oct 2016 08:30:23 +0200
Subject: [PATCH 1/2] docker-binary: new

This installs a binary distribution of docker. This contradicts our
source-only rule, but should be allowed as an intermediate step.

There are a lot of complicated requirements to build docker from source.
The easiest way to do that is to build it inside a docker image.
However, this requires an existing docker installation and is the same
hen-and-egg problem as the gcc bootstrap.

This package is meant to be a bootstrap package. Only when building
docker from source for the very first time, this package can be
installed on the build system.
---
 docker_binary.be0 | 91 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100755 docker_binary.be0

diff --git a/docker_binary.be0 b/docker_binary.be0
new file mode 100755
index 000000000..bc612dbc5
--- /dev/null
+++ b/docker_binary.be0
@@ -0,0 +1,91 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION docker_binary-1.12.1-0.bee
+
+## this file was created by bee init and should be executed to build a
+## bee-package. (Additional hints are located at the end of this file.)
+
+###############################################################################
+## The source URL(s) define the location of the sources that will be
+## downloaded. Version variables may be used to simplify reuse of this bee-file.
+
+SRCURL[0]="https://get.docker.com/builds/Linux/x86_64/docker-${PKGVERSION}.tgz"
+
+###############################################################################
+## Add URLs/pathes to patch files to the PATCHURL array.
+## The sources will be patched in the order of the array.
+
+# PATCHURL+=()
+
+###############################################################################
+## Add filename patterns to the EXCLUDE array of files that should not
+## be added to you package but may be present in the image directory.
+
+# EXCLUDE+=()
+
+###############################################################################
+## Uncomment the next statement, if the software may not be able to be built
+## outside the source directory and needs to be built inside the source
+## directory.
+
+build_in_sourcedir
+
+###############################################################################
+## bee cannot detect buildtypes specified in subdirectories.
+## Sometimes packages "hide" the real sources in a subdirectory named
+## 'src' or 'cmake' or ..
+## use 'sourcesubdir_append' to specify this directory if known.
+
+# sourcesubdir_append src
+
+
+###############################################################################
+## Change the default (auto-detected) steps to
+## extract, patch, configure/setup, build and install the software.
+## Make sure the mee_install function does install everything to the
+## image directory "${D}"
+
+#mee_extract() {
+#    bee_extract "${@}"
+#}
+
+#mee_patch() {
+#    bee_patch "${@}"
+#}
+
+mee_configure() {
+     : not needed
+}
+
+mee_build() {
+     : not needed
+}
+
+mee_install() {
+    install --directory $D$BINDIR
+    install --directory $D$SYSCONFDIR/default
+    install --target-directory=$D$BINDIR $B/*
+    cat >$D$SYSCONFDIR/default/docker <<-'__EOF__'
+	DOCKER_OPTS="--storage-driver=overlay2"
+	__EOF__
+}
+
+## by default this may be 'make install DESTDIR="${D}"'
+
+###############################################################################
+##
+## Additional hints:
+##
+## The name of this bee-file should follow the following naming convention:
+##     pkgname-pkgversion-pkgrevision.bee
+##
+## You may remove all comments as long as SRCURL[0] is set.
+##
+## Everything in this file will be executed in a bash environment.
+##
+## Build the package by executing
+##     './pkg-version-N.bee' or
+##     'beesh ./pkg-version-N.bee'
+##
+## see http://beezinga.org/
+##

From 2d7438a0ff6c8ab65cc0807e9c2d8cae866cd93c Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Tue, 22 Nov 2016 21:47:10 +0100
Subject: [PATCH 2/2] docker_binary: move into "uninstalled" directory

We used to have a separate orphaned branch for bee files, which were not
to be installed in the mariux64 distmaster. This was not a good idea,
because the concept of orphaned branches is to cryptic.

So instead create a directory "uninstalled" for that purpose and move the
single existing bee file there.
---
 docker_binary.be0 => uninstalled/docker_binary.be0 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docker_binary.be0 => uninstalled/docker_binary.be0 (100%)

diff --git a/docker_binary.be0 b/uninstalled/docker_binary.be0
similarity index 100%
rename from docker_binary.be0
rename to uninstalled/docker_binary.be0