From e47136f68105717ed9c177e283ce2fd4ab831ddd Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <bbannier@apache.org>
Date: Mon, 12 Feb 2018 11:25:36 +0100
Subject: [PATCH 1/2] Moved some docker image setups to dedicated directory.

---
 support/{ => docker}/mesos-build/centos-7.dockerfile     | 0
 support/{ => docker}/mesos-build/enable-devtoolset-4.sh  | 0
 support/{ => docker}/mesos-build/entrypoint.sh           | 0
 support/{ => docker}/mesos-build/ubuntu-16.04.dockerfile | 0
 support/{ => docker}/mesos-tidy/Dockerfile               | 0
 support/{ => docker}/mesos-tidy/README.md                | 0
 support/{ => docker}/mesos-tidy/entrypoint.sh            | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename support/{ => docker}/mesos-build/centos-7.dockerfile (100%)
 rename support/{ => docker}/mesos-build/enable-devtoolset-4.sh (100%)
 rename support/{ => docker}/mesos-build/entrypoint.sh (100%)
 rename support/{ => docker}/mesos-build/ubuntu-16.04.dockerfile (100%)
 rename support/{ => docker}/mesos-tidy/Dockerfile (100%)
 rename support/{ => docker}/mesos-tidy/README.md (100%)
 rename support/{ => docker}/mesos-tidy/entrypoint.sh (100%)

diff --git a/support/mesos-build/centos-7.dockerfile b/support/docker/mesos-build/centos-7.dockerfile
similarity index 100%
rename from support/mesos-build/centos-7.dockerfile
rename to support/docker/mesos-build/centos-7.dockerfile
diff --git a/support/mesos-build/enable-devtoolset-4.sh b/support/docker/mesos-build/enable-devtoolset-4.sh
similarity index 100%
rename from support/mesos-build/enable-devtoolset-4.sh
rename to support/docker/mesos-build/enable-devtoolset-4.sh
diff --git a/support/mesos-build/entrypoint.sh b/support/docker/mesos-build/entrypoint.sh
similarity index 100%
rename from support/mesos-build/entrypoint.sh
rename to support/docker/mesos-build/entrypoint.sh
diff --git a/support/mesos-build/ubuntu-16.04.dockerfile b/support/docker/mesos-build/ubuntu-16.04.dockerfile
similarity index 100%
rename from support/mesos-build/ubuntu-16.04.dockerfile
rename to support/docker/mesos-build/ubuntu-16.04.dockerfile
diff --git a/support/mesos-tidy/Dockerfile b/support/docker/mesos-tidy/Dockerfile
similarity index 100%
rename from support/mesos-tidy/Dockerfile
rename to support/docker/mesos-tidy/Dockerfile
diff --git a/support/mesos-tidy/README.md b/support/docker/mesos-tidy/README.md
similarity index 100%
rename from support/mesos-tidy/README.md
rename to support/docker/mesos-tidy/README.md
diff --git a/support/mesos-tidy/entrypoint.sh b/support/docker/mesos-tidy/entrypoint.sh
similarity index 100%
rename from support/mesos-tidy/entrypoint.sh
rename to support/docker/mesos-tidy/entrypoint.sh

From 7af8ea15110ed56f4d8855531c7c07c5dc96a93c Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <bbannier@apache.org>
Date: Mon, 12 Feb 2018 12:32:26 +0100
Subject: [PATCH 2/2] Docker image build setup.

---
 support/docker/Makefile        | 36 ++++++++++++++++++++++++++++++++++
 support/docker/test/Dockerfile |  4 ++++
 support/docker/test/foo.sh     |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 support/docker/Makefile
 create mode 100644 support/docker/test/Dockerfile
 create mode 100755 support/docker/test/foo.sh

diff --git a/support/docker/Makefile b/support/docker/Makefile
new file mode 100644
index 00000000000..93cee3e3813
--- /dev/null
+++ b/support/docker/Makefile
@@ -0,0 +1,36 @@
+DIR := mesos-tidy
+USER := mesos
+IMAGE := ${USER}/${DIR}
+DOCKERFILE := Dockerfile
+
+# TODO(bbannier): Consider making this depend on the current
+# dir instead of the image dir if we end up composing images.
+BRANCH := `git rev-list -1 HEAD -- $(DIR)`
+
+# Construct a name for the tagged image. We allow the image name
+# to contain literal `:` and fall back to `_` in that case.
+ifneq (,$(findstring $(FOO), :))
+  DEL := _
+else
+  DEL := :
+endif
+TAGGED := $(IMAGE)$(DEL)$(BRANCH)
+
+THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST))
+
+# FIXME(bbannier): add a NO_CACHE variable to force building without cache use.
+
+all:
+	@$(MAKE) -f $(THIS_MAKEFILE) pull || $(MAKE) -f $(THIS_MAKEFILE) publish
+
+pull:
+	@docker pull $(TAGGED)
+	@docker pull $(IMAGE)
+
+build:
+	@(cd $(DIR) && docker build -t $(IMAGE) -f $(DOCKERFILE) .)
+	@docker tag $(IMAGE) $(TAGGED)
+
+publish: build
+	@docker push $(IMAGE)
+	@docker push $(TAGGED)
diff --git a/support/docker/test/Dockerfile b/support/docker/test/Dockerfile
new file mode 100644
index 00000000000..c5993b77e84
--- /dev/null
+++ b/support/docker/test/Dockerfile
@@ -0,0 +1,4 @@
+FROM alpine:3.6
+
+COPY foo.sh foo.sh
+CMD ./foo.sh
diff --git a/support/docker/test/foo.sh b/support/docker/test/foo.sh
new file mode 100755
index 00000000000..4a6e351d31d
--- /dev/null
+++ b/support/docker/test/foo.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "hello world"