summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2014-06-15 21:18:52 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-05 10:01:44 (GMT)
commit90c9d9490423dc130af9299e331c0b172850e84e (patch)
tree4e5d1d21431431e1e1fc128e0656efe13f4f15ef
parent9db098b719c666372c77f0b4c6a8dfd0125ce6a5 (diff)
downloaddefinitions-90c9d9490423dc130af9299e331c0b172850e84e.tar.gz
add a new go-docker stratum, and amend linux configs to work with it
-rw-r--r--go-docker.morph19
-rw-r--r--strata/bsp-x86_64-generic.morph5
2 files changed, 21 insertions, 3 deletions
diff --git a/go-docker.morph b/go-docker.morph
new file mode 100644
index 0000000..c32c2a2
--- /dev/null
+++ b/go-docker.morph
@@ -0,0 +1,19 @@
+name: go-docker
+kind: stratum
+build-depends:
+- morph: tools
+chunks:
+- name: go
+ repo: upstream:go
+ ref: baserock/go1.2.2
+ build-depends: []
+- name: docker
+ repo: upstream:docker
+ ref: baserock/ps/add-go-docker
+ build-depends:
+ - go
+- name: iptables
+ repo: upstream:iptables
+ ref: 3e6fa55d5e28c93f417afeae7a7d4f349ddffcf4
+ unpetrify-ref: baserock/morph
+ build-depends: []
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index 81c99e4..4c3b502 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -6,10 +6,9 @@ build-depends:
- morph: strata/core.morph
chunks:
- name: linux-x86-64-generic
- morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph
repo: upstream:linux
- ref: d67a0e110187abd560a1de63fa172894a52839d5
- unpetrify-ref: baserock/morph
+ ref: baserock/ps/add-go-docker
+ unpetrify-ref: 9341b8374cc22fcefece1aa3e120268239936a3f
build-depends: []
- name: nasm
morph: strata/bsp-x86_64-generic/nasm.morph