switch base

3 files changed, 1 insertions, 30 deletions

diff --git a/s2i/bin/assemble b/s2i/bin/assemble
index 9533c8a..5585771 100755
--- a/s2i/bin/assemble
+++ b/s2i/bin/assemble
@@ -1,22 +1,10 @@
 #!/bin/bash -e
 #
-# S2I assemble script for the 'kraxel/s2i-jekyll' image.
-# The 'assemble' script builds your application source so that it is ready to run.
-#
 # For more information refer to the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
 
-if [[ "$1" == "-h" ]]; then
-	exec /usr/libexec/s2i/usage
-fi
-
-echo "--- debug ---"
-id -a
-echo "---"
-
-export HOME=/opt/app-root/src
-cd $HOME
+source ${0}.pre
 
 echo "---> Installing application source ..."
 mv /tmp/src ./virtio-spec
diff --git a/s2i/bin/run b/s2i/bin/run
deleted file mode 100755
index 6692e10..0000000
--- a/s2i/bin/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-echo "--- debug ---"
-find /etc/httpd -type f | xargs egrep -i -e '(listen)'
-echo "---"
-exec httpd -D FOREGROUND
diff --git a/s2i/bin/usage b/s2i/bin/usage
deleted file mode 100755
index 9ca2b10..0000000
--- a/s2i/bin/usage
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-cat <<EOF
-This is the kraxel/s2i-virtio-spec S2I image:
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-Sample invocation:
-
-s2i build <source code path/URL> kraxel/s2i-virtio-spec <application image>
-
-You can then run the resulting image via:
-docker run <application image>
-EOF