summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile13
-rw-r--r--catlfish-build/Dockerfile5
-rw-r--r--catlfish-build/start.sh7
3 files changed, 18 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index b21d0e2..47d7d96 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-catlfish-dev catlfish-dev-lunahsm:
- docker build --no-cache --rm -t $@:latest $@
+dist:
+ docker run -v /tar-files:. -e COPYTO=/tar-files catlfish-build
-erlang:
+catlfish-build:
docker build --no-cache --rm -t $@:latest $@
-base:
- docker build --no-cache --rm -t $@:latest base-debian:jessie
+catlfish-dev catlfish-dev-lunahsm:
+ docker build --no-cache --rm -t $@:latest $@
onion:
docker build --no-cache --rm -t $@:latest $@
@@ -13,5 +13,4 @@ onion:
catlfish:
FIXME
-.PHONY: catlfish-dev catlfish-dev-lunahsm erlang base onion catlfish
-
+.PHONY: dist catlfish-build catlfish-dev catlfish-dev-lunahsm onion catlfish
diff --git a/catlfish-build/Dockerfile b/catlfish-build/Dockerfile
new file mode 100644
index 0000000..451aa0d
--- /dev/null
+++ b/catlfish-build/Dockerfile
@@ -0,0 +1,5 @@
+FROM catlfish-dev
+
+ADD start.sh /
+WORKDIR /usr/local/src/catlfish
+ENTRYPOINT ["/start.sh"]
diff --git a/catlfish-build/start.sh b/catlfish-build/start.sh
new file mode 100644
index 0000000..65b3f7a
--- /dev/null
+++ b/catlfish-build/start.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -o errexit
+set -o nounset
+
+make dist
+[ -n "${COPYTO}" ] && cp catlfish-*.tar.* ${COPYTO}/