Make the artifacts archive use relative paths to $HOME

Author: mfojtik

centos-ruby-builder/bin/restore-artifacts

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-tar -C / -xf -
+cd $HOME
+
+exec tar -xzf -

centos-ruby-builder/bin/save-artifacts

@@ -1,3 +1,7 @@
 #!/bin/bash
 
-tar -cf - /opt/ruby/bundle
+cd $HOME
+
+# List the files and directories you would like to archive.
+#
+exec tar -czf - {bundle,gems}

centos-ruby-builder/bin/start

@@ -11,11 +11,14 @@ source ${HOME}/etc/helpers
 # If the /tmp/src is empty, then print usage and exit.
 (dir_is_empty /tmp/src) && print_usage_and_exit
 
-# Detect presence of $stdin and restore the artifacts
+# Detect the presence of $stdin and restore the artifacts
+# To restore the artifacts, you have to run the builder as:
+#
+# docker run -v $(pwd):/tmp/src openshift/centos-ruby-builder < artifacts.tgz
 #
 if [ -p /dev/stdin ]; then
-  echo "---> Restoring artifacts from STDIN"
-  cat | /opt/ruby/bin/restore-artifacts
+  echo "---> Restoring artifacts"
+  cat | ${HOME}/bin/restore-artifacts
 fi
 
 # Build the ruby application first
@@ -24,5 +27,6 @@ ${HOME}/bin/prepare
 
 # Replace this script with the application runner at the end of the build.
 #
-echo "---> Build successful. Commit this image with: docker commit ${HOSTNAME} ruby-app"
+echo "---> Build successful. Commit this image with: 'docker commit ${HOSTNAME} ruby-app'"
+
 cp -f ${HOME}/bin/run ${HOME}/bin/start && exit

centos-ruby-builder/etc/helpers

@@ -3,14 +3,22 @@
 
 function print_usage_and_exit() {
   echo
-  echo "This image can build your Ruby source code."
-  echo "To build from a git repo, run this in your checked out repo:"
+  echo "This is the Ruby/Rails self-contained builder image."
+  echo "You can use this to produce application images:"
   echo
-  echo "  docker run -v \$(pwd):/tmp/src openshift/centos-ruby-builder"
+  echo "  $ docker run -v \$(pwd):/tmp/src openshift/centos-ruby-builder"
   echo
-  echo "Options:"
+  echo "You can also archive artifacts from the current application image:"
+  echo
+  echo "  $ docker run --entrypoint='${HOME}/bin/save-artifacts' ruby-app > archive.tgz"
+  echo
+  echo "And restore the artifacts on the next build:"
+  echo
+  echo "  $ docker run -v \$(pwd):/tmp/src openshift/centos-ruby-builder < archive.tgz"
+  echo
+  echo "Other options:"
   echo
   echo "  --debug       Drop to the shell instead of build."
   echo
-  exit
+  exit 0
 }