From 056b9318d44703b13a1cde84afd7db373109acbb Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cloudius-systems.com>
Date: Wed, 28 May 2014 13:42:37 +0300
Subject: [PATCH] scripts: Separate Capstan and VM image building
This separates Capstan and VM image building into two scripts. This is
needed to be able to drop useless VM images like "osv-base" or
"osv-openjdk" that only make sense as Capstan base images, not
standalone VM images that people boot to.
Cc: Tzach Livyatan <tzach@cloudius-systems.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
---
scripts/{build-osv-release => build-capstan-images} | 11 +----------
scripts/build-vm-images | 11 +++++++++++
scripts/{build-standalone-img => build-vm-img} | 0
3 files changed, 12 insertions(+), 10 deletions(-)
rename scripts/{build-osv-release => build-capstan-images} (82%)
create mode 100755 scripts/build-vm-images
rename scripts/{build-standalone-img => build-vm-img} (100%)
diff --git a/scripts/build-osv-release b/scripts/build-capstan-images
similarity index 82%
rename from scripts/build-osv-release
rename to scripts/build-capstan-images
index 780d08096..98f406b9b 100755
--- a/scripts/build-osv-release
+++ b/scripts/build-capstan-images
@@ -1,17 +1,8 @@
#!/bin/sh
-program=$(basename $0)
-
set -e
-if [ $# -lt 1 ]; then
- echo "usage: $program [standalone|capstan]"
- exit 1
-fi
-
-type=$1
-
-build=./scripts/build-$type-img
+build=./scripts/build-capstan-img
$build cloudius/osv-base httpserver "OSv base image for developers"
$build cloudius/osv default "OSv with shell for users"
diff --git a/scripts/build-vm-images b/scripts/build-vm-images
new file mode 100755
index 000000000..b87086d1d
--- /dev/null
+++ b/scripts/build-vm-images
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+build=./scripts/build-vm-img
+
+$build cloudius/osv default "OSv with shell for users"
+$build cloudius/osv-cassandra cassandra,httpserver "Apache Cassandra/OSv"
+$build cloudius/osv-tomcat tomcat,httpserver "Apache Tomcat/OSv"
+$build cloudius/osv-iperf iperf,httpserver "iperf/OSv"
+$build cloudius/osv-memcached-opt osv-memcached,httpserver "OSv memcached server (optimized)"
diff --git a/scripts/build-standalone-img b/scripts/build-vm-img
similarity index 100%
rename from scripts/build-standalone-img
rename to scripts/build-vm-img
--
GitLab