From 3a499e70fd2e1c43fa2842733c77bd1e8bc53c68 Mon Sep 17 00:00:00 2001
From: mudler <mudler@dark-lab.net>
Date: Fri, 13 Nov 2015 20:11:44 +0100
Subject: [PATCH] [circle] adding build script and on-the-fly imagebuild

---
 circle.yml      |  5 +----
 script/build.sh | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100755 script/build.sh

diff --git a/circle.yml b/circle.yml
index ea1166f..ff0053d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -5,10 +5,7 @@ machine:
 dependencies:
   override:
     - docker info
-    - docker build -t sabayon/builder-amd64 .
-    - docker run sabayon/builder-amd64 app-text/tree
-    - docker export $( docker ps -aq | xargs echo | cut -d ' ' -f 1) | docker import - sabayon/builder-amd64-squashed
-    - docker export $( docker ps -aq | xargs echo | cut -d ' ' -f 1) | docker import - sabayon/builder-amd64
+    - ./script/build.sh
 test:
   override:
     - docker run sabayon/builder-amd64-squashed app-text/tree
diff --git a/script/build.sh b/script/build.sh
new file mode 100755
index 0000000..0e605ad
--- /dev/null
+++ b/script/build.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -o nounset
+set -o errexit
+
+
+docker build -t sabayon/builder-amd64 .
+docker run sabayon/builder-amd64 true || true
+docker export $( docker ps -aq | xargs echo | cut -d ' ' -f 1) | docker import - sabayon/builder-amd64-tmp
+
+
+mkdir -p ~/image
+mkdir -p ~/imagesquashed
+
+cat <<- EOF > /image/Dockerfile
+FROM sabayon/spinbase-amd64-tmp
+MAINTAINER mudler <mudler@sabayonlinux.org>
+# Define standard volumes
+VOLUME ["/usr/portage", "/usr/portage/distfiles", "/usr/portage/packages", "/var/lib/entropy/client/packages"]
+
+# Define default command.
+ENTRYPOINT ["/builder"]
+EOF
+cp -rfv /image/Dockerfile /imagesquashed
+
+docker build -t sabayon/builder-amd64 ~/image
+docker build -t sabayon/builder-amd64-squashed ~/imagesquashed