summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-05 10:08:02 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-05 10:08:02 (GMT)
commit8600f34687064b49ad8ec84a5ec4b6ba6fb6c921 (patch)
tree5f71ff6a645be26c4860f7bfe5b72a68f59ba161
parent90c9d9490423dc130af9299e331c0b172850e84e (diff)
downloaddefinitions-8600f34687064b49ad8ec84a5ec4b6ba6fb6c921.tar.gz
go-docker: Bring chunk morphs into definitions
-rw-r--r--strata/go-docker.morph (renamed from go-docker.morph)4
-rw-r--r--strata/go-docker/docker.morph10
-rw-r--r--strata/go-docker/go.morph12
3 files changed, 25 insertions, 1 deletions
diff --git a/go-docker.morph b/strata/go-docker.morph
index c32c2a2..fb4533f 100644
--- a/go-docker.morph
+++ b/strata/go-docker.morph
@@ -1,13 +1,15 @@
name: go-docker
kind: stratum
build-depends:
-- morph: tools
+- morph: strata/tools.morph
chunks:
- name: go
+ morph: strata/go-docker/go.morph
repo: upstream:go
ref: baserock/go1.2.2
build-depends: []
- name: docker
+ morph: strata/go-docker/docker.morph
repo: upstream:docker
ref: baserock/ps/add-go-docker
build-depends:
diff --git a/strata/go-docker/docker.morph b/strata/go-docker/docker.morph
new file mode 100644
index 0000000..0247e19
--- /dev/null
+++ b/strata/go-docker/docker.morph
@@ -0,0 +1,10 @@
+name: docker
+kind: chunk
+build-commands:
+- export AUTO_GOPATH=1 && export DOCKER_BUILDTAGS='exclude_graphdriver_devicemapper' && export TMPDIR=/tmp && ./hack/make.sh binary
+#- export DOCKER_CLIENTONLY=1
+#- ./hack/make.sh dynbinary
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX/bin"
+- cp ./bundles/*/binary/docker "$DESTDIR$PREFIX/bin/docker"
+- cp ./contrib/check-config.sh "$DESTDIR$PREFIX/bin"
diff --git a/strata/go-docker/go.morph b/strata/go-docker/go.morph
new file mode 100644
index 0000000..b3ddcda
--- /dev/null
+++ b/strata/go-docker/go.morph
@@ -0,0 +1,12 @@
+name: go
+kind: chunk
+build-commands:
+- export GOROOT_FINAL="$PREFIX/lib/go" && export TMPDIR=/tmp && cd src && bash ./all.bash
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX/lib/go"
+- cp -r bin "$DESTDIR$PREFIX/lib/go"
+- cp -r lib "$DESTDIR$PREFIX/lib/go"
+- cp -r src "$DESTDIR$PREFIX/lib/go"
+- cp -r pkg "$DESTDIR$PREFIX/lib/go"
+- mkdir -p "$DESTDIR$PREFIX/bin"
+- ln -s "$PREFIX/lib/go/bin/go" "$DESTDIR$PREFIX/bin/go"