From: Brett Smith <brett@curoverse.com>
Date: Mon, 29 Jun 2015 20:56:57 +0000 (-0400)
Subject: 6389: Add Makefile to support Docker builds.
X-Git-Url: https://git.arvados.org/arvados-dev.git/commitdiff_plain/8f04915e13d44ce5028eb07f3eed3879a592f11b

6389: Add Makefile to support Docker builds.
---

diff --git a/jenkins/dockerfiles/.gitignore b/jenkins/dockerfiles/.gitignore
new file mode 100644
index 0000000..ceee9fa
--- /dev/null
+++ b/jenkins/dockerfiles/.gitignore
@@ -0,0 +1,2 @@
+*/generated
+common-generated/
diff --git a/jenkins/dockerfiles/Makefile b/jenkins/dockerfiles/Makefile
new file mode 100644
index 0000000..046495a
--- /dev/null
+++ b/jenkins/dockerfiles/Makefile
@@ -0,0 +1,17 @@
+all: debian7/generated ubuntu1204/generated
+
+debian7/generated: common-generated-all
+	test -d debian7/generated || mkdir debian7/generated
+	cp -rlt debian7/generated common-generated/*
+
+ubuntu1204/generated: common-generated-all
+	test -d ubuntu1204/generated || mkdir ubuntu1204/generated
+	cp -rlt ubuntu1204/generated common-generated/*
+
+common-generated-all: common-generated/golang-amd64.tar.gz
+
+common-generated/golang-amd64.tar.gz: common-generated
+	wget -cqO common-generated/golang-amd64.tar.gz https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
+
+common-generated:
+	mkdir common-generated
diff --git a/jenkins/dockerfiles/README b/jenkins/dockerfiles/README
index 2ae68cd..0dfab94 100644
--- a/jenkins/dockerfiles/README
+++ b/jenkins/dockerfiles/README
@@ -1,29 +1,13 @@
 ==================
-BUILD
+DOCKER IMAGE BUILD
 ==================
 
-cd dockerfiles/ubuntu1204
-docker build -t arvados/build:ubuntu1204 .
+1. `make`
+2. `cd DISTRO`
+3. `docker build -t arvados/build:DISTRO .`
 
-or
+==============
+BUILD PACKAGES
+==============
 
-cd dockerfiles/debian7
-docker build -t arvados/build:debian7 .
-
-==================
-START
-==================
-
-docker run  -v /path/to/your/arvados-dev/jenkins:/jenkins -v /path/to/your/arvados:/arvados -i -t <imagehash> /bin/bash
-
-====================
-INSIDE THE CONTAINER
-====================
-
-source /etc/profile.d/rvm.sh
-
-WORKSPACE=/arvados ./run-build-packages.sh --target debian7
-
-or
-
-WORKSPACE=/arvados ./run-build-packages.sh --target ubuntu1204
+`docker run -v /path/to/your/arvados-dev/jenkins:/jenkins -v /path/to/your/arvados:/arvados arvados/build:DISTRO`