From 0b7539643547535a8c91ef9e605fa2ac78f3feb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
Date: Fri, 18 Jan 2019 15:28:00 +0100
Subject: [PATCH 1/2] Initial commit

---
 Dockerfile | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..5b06a6b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,39 @@
+#
+# This is the image that executes a Docker build inside Origin. It expects the
+# following environment variables:
+#
+#   BUILD - JSON string containing the openshift build object
+#
+# This image expects to have the Docker socket bind-mounted into the container.
+# If "/root/.dockercfg" is bind mounted in, it will use that as authorization to a
+# Docker registry. It depends on bsdtar for extraction of binaries over STDIN.
+#
+# The standard name for this image is openshift/origin-docker-builder
+#
+FROM registry.fedoraproject.org/origin-cli:29
+
+ENV NAME=origin-docker-builder \
+    VERSION=3.11 \
+    ARCH=x86_64
+
+RUN INSTALL_PKGS=" \
+      which tar wget hostname util-linux \
+      socat tree findutils lsof bind-utils \
+      git tar bsdtar \
+      " && \
+    dnf install -y ${INSTALL_PKGS} && \
+    dnf clean all
+
+LABEL io.k8s.display-name="OpenShift Origin Builder" \
+      io.k8s.description="This is a component of OpenShift Origin and is responsible for executing image builds." \
+      io.openshift.tags="openshift,builder" \
+      summary="This is a component of OpenShift Origin and is responsible for executing image builds." \
+      maintainer="Jakub Cajka <jcajka@fedoraproject.org>" \
+      License="GPLv2+" \
+      name="$FGC/$NAME" \
+      com.redhat.component="$NAME" \
+      version="$VERSION" \
+      architecture="$ARCH" \
+      usage="This is a component of OpenShift Origin and is responsible for executing image builds."
+
+ENTRYPOINT ["/usr/bin/openshift-docker-build"]

From 05caf0bcdffaeae81d465eb6ef7be7303920ebad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
Date: Fri, 18 Jan 2019 15:43:55 +0100
Subject: [PATCH 2/2] Fix FROM statement

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5b06a6b..50e504e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@
 #
 # The standard name for this image is openshift/origin-docker-builder
 #
-FROM registry.fedoraproject.org/origin-cli:29
+FROM registry.fedoraproject.org/f29/origin-cli:latest
 
 ENV NAME=origin-docker-builder \
     VERSION=3.11 \