Merge pull request #5 from markllama/master

Moved bash to bash-full - meaning to create a two-stage bash test

bash/mktree.sh → bash-test/mktree.sh

@@ -15,16 +15,19 @@ mkdir -p ${DEST}/usr/bin
 
 for BINFILE in ${BINFILES}
 do
+	        echo -n "${BINFILE} " && rpm -qf ${BINFILE}
 		cp ${BINFILE} ${DEST}${BINFILE}
 		chmod a+x ${DEST}${BINFILE}
 		SHAREDOBJS=$(ldd ${BINFILE} | awk '{print $1}' | grep -e ^/)
 		for SOFILE in ${SHAREDOBJS}
 		do
+	                        echo -n "${SOFILE} " && rpm -qf ${SOFILE}
 				cp ${SOFILE} ${DEST}${SOFILE}
 		done
 		SHAREDOBJS=$(ldd ${BINFILE} | awk '{print $3}' | grep -e ^/lib)
 		for SOFILE in ${SHAREDOBJS}
 		do
+	                        echo -n "${SOFILE} " && rpm -qf ${SOFILE}
 				cp ${SOFILE} ${DEST}${SOFILE}
 		done
 

bash/run.sh → bash-test/run.sh

@@ -11,7 +11,7 @@ env
 echo
 echo "--- Root File System Contents ---"
 echo
-/usr/bin/find / -wholename /proc -prune -o -print
+/usr/bin/find / -wholename /proc -prune -o -wholename /sys -prune -o -print
 echo
 echo "--- Proc File System Root ---"
 echo

mongodb/mktree.sh

@@ -21,19 +21,23 @@ touch ${ROOTFS}/dev/urandom
 
 for BINFILE in ${BINFILES}
 do
+                echo -n "${BINFILE} " && rpm -qf --qf "%{NAME}\n" ${BINFILE}
 		cp ${BINFILE} ${ROOTFS}${BINFILE}
 		SHAREDOBJS=$(ldd ${BINFILE} | awk '{print $1}' | grep -e ^/)
 		for SOFILE in ${SHAREDOBJS}
 		do
+                		echo -n "${SOFILE} " && rpm -qf --qf "%{NAME}\n" ${SOFILE}
 				cp ${SOFILE} ${ROOTFS}${SOFILE}
 		done
 		SHAREDOBJS=$(ldd ${BINFILE} | awk '{print $3}' | grep -e ^/lib)
 		for SOFILE in ${SHAREDOBJS}
 		do
+                		echo -n "${SOFILE} " && rpm -qf --qf "%{NAME}\n" ${SOFILE}
 				cp ${SOFILE} ${ROOTFS}${SOFILE}
 		done
 
 done
+echo -n "${CONFIGFILE} " && rpm -qf --qf "%{NAME}\n" ${CONFIGFILE}
 cp ${CONFIGFILE} ${ROOTFS}${CONFIGFILE}
 
 cp manifest ${DEST}

python/manifest

@@ -0,0 +1,33 @@
+{
+		"acKind": "ImageManifest",
+		"acVersion": "0.5.1",
+		"name": "fedora-rocketfiles/python",
+		"labels": [
+				{
+						"name": "version",
+						"value": "0.1.1"
+				},
+				{
+						"name": "arch",
+						"value": "amd64"
+				},
+				{
+						"name": "os",
+						"value": "linux"
+				}
+		],
+		"app": {
+				"exec": [
+						"/usr/bin/python",
+						"/run.py"
+				],
+				"user": "0",
+				"group": "0"
+		},
+		"annotations": [
+			{
+				"name": "authors",
+				"value": "Mark Lamourine <markllama@gmail.com>"
+			}
+		]
+}

python/mktree.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# Make a Rocket image tree for mongodb
+#
+SOURCE=""
+DEST=image/rootfs
+BINFILES="/usr/bin/python"
+PYLIBDIR=/usr/lib64/python2.7
+PYLIBEXECDIR=${PYLIBDIR}/lib-dynload
+PYMODULES="site os posixpath stat genericpath warnings linecache types
+UserDict _abcoll abc _weakrefset copy_reg traceback sysconfig 
+re sre_compile sre_parse sre_constants
+_sysconfigdata
+"
+
+mkdir -p ${DEST}
+mkdir -p ${DEST}/lib64
+mkdir -p ${DEST}/usr/bin
+mkdir -p ${DEST}${PYLIBDIR}
+mkdir -p ${DEST}${PYLIBEXECDIR}
+# /usr/lib64/python2.7/plat-linux2
+
+
+for BINFILE in ${BINFILES}
+do
+	  echo -n "${BINFILE} " && rpm -qf --qf "%{NAME}\n" ${BINFILE}
+		cp ${BINFILE} ${DEST}${BINFILE}
+		chmod a+x ${DEST}${BINFILE}
+		SHAREDOBJS=$(ldd ${BINFILE} | awk '{print $1}' | grep -e ^/)
+		for SOFILE in ${SHAREDOBJS}
+		do
+	      echo -n "${SOFILE} " && rpm -qf --qf "%{NAME}\n" ${SOFILE}
+				cp ${SOFILE} ${DEST}${SOFILE}
+		done
+		SHAREDOBJS=$(ldd ${BINFILE} | awk '{print $3}' | grep -e ^/lib)
+		for SOFILE in ${SHAREDOBJS}
+		do
+	      echo -n "${SOFILE} " && rpm -qf ${SOFILE}
+				cp ${SOFILE} ${DEST}${SOFILE}
+		done
+done
+
+for MODULE in ${PYMODULES}
+do
+		PYCFILE=${PYLIBDIR}/${MODULE}.pyc
+		echo -n "${PYCFILE} " && rpm -qf --qf "%{NAME}\n" ${PYCFILE} 
+		cp ${PYLIBDIR}/${MODULE}.pyc ${DEST}/${PYLIBDIR}/${MODULE}.pyc
+done
+
+#cp ${CONFIGFILE} ${DEST}${CONFIGFILE}
+cp run.py ${DEST}/run.py
+chmod a+x ${DEST}/run.py
+
+cp manifest image

python/run.py

@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+if __name__ == "__main__":
+    print "Hello"