Merge branch 'master' of https://bitbucket.org/yackob03/quay

2014-07-14 16:26:29 -04:00 · 2014-07-14 16:26:29 -04:00 · abe2ffb377
commit abe2ffb377
parent 75ec80ee6c 0df8fe031b
4 changed files with 22 additions and 1 deletions
--- a/22
+++ b/22
@ -0,0 +1,22 @@
+version = 1
+
+[docker]
+  build_opts = ["--rm"]
+
+[container_globals]
+  registry = "quay.io/quay"
+  skip_push = true
+
+[[container]]
+  name = "quay"
+  Dockerfile = "Dockerfile.web"
+  project = "quay"
+  tags = ["git:short", "latest"]
+
+[[container]]
+  name = "builder"
+  Dockerfile = "Dockerfile.buildworker"
+  project = "builder"
+  tags = ["git:short", "latest"]
+
+# vim:ft=toml
--- a/1
+++ b/1
@ -1 +0,0 @@
-Dockerfile.web
--- a/binary_dependencies/builder/lxc-docker-0.11.1-tutum2_0.11.1-tutum2-20140605234132-543689a-dirty_amd64.deb
+++ b/binary_dependencies/builder/lxc-docker-0.11.1-tutum2_0.11.1-tutum2-20140605234132-543689a-dirty_amd64.deb
--- a/binary_dependencies/builder/lxc-docker-1.1.0-tutum_1.1.0-tutum-20140711175158-768e3fe-dirty_amd64.deb
+++ b/binary_dependencies/builder/lxc-docker-1.1.0-tutum_1.1.0-tutum-20140711175158-768e3fe-dirty_amd64.deb