Fix rootfs build process to be more portable

[#89744426]

Makefile

@@ -1,27 +1,26 @@
 all: cflinuxfs2.tar.gz lucid64.tar.gz
 
+
 cflinuxfs2.cid: cflinuxfs2/Dockerfile
 	docker build --no-cache -t cloudfoundry/cflinuxfs2 cflinuxfs2
 	docker run --cidfile=cflinuxfs2.cid cloudfoundry/cflinuxfs2 dpkg -l | tee cflinuxfs2/cflinuxfs2_dpkg_l.out
 
 cflinuxfs2.tar: cflinuxfs2.cid
-	docker export `cat cflinuxfs2.cid` > cflinuxfs2.tar
+	docker export `cat cflinuxfs2.cid` > /tmp/cflinuxfs2.tar
 	# Always remove the cid file in order to grab updated package versions.
 	rm cflinuxfs2.cid
 
 cflinuxfs2.tar.gz: cflinuxfs2.tar
-	tar -C cflinuxfs2/assets -f cflinuxfs2.tar -r etc/hosts etc/timezone
-	gzip -f cflinuxfs2.tar
+	./bin/make_tarball.sh cflinuxfs2
 
 lucid64.cid: lucid64/Dockerfile
 	docker build --no-cache -t cloudfoundry/lucid64 lucid64
 	docker run --cidfile=lucid64.cid cloudfoundry/lucid64 dpkg -l | tee lucid64/lucid64_dpkg_l.out
 
 lucid64.tar: lucid64.cid
-	docker export `cat lucid64.cid` > lucid64.tar
+	docker export `cat lucid64.cid` > /tmp/lucid64.tar
 	# Always remove the cid file in order to grab updated package versions.
 	rm lucid64.cid
 
 lucid64.tar.gz: lucid64.tar
-	tar -C lucid64/assets -f lucid64.tar -r etc/hosts etc/timezone
-	gzip -f lucid64.tar
+	./bin/make_tarball.sh lucid64

bin/make_tarball.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+make_tarball="
+	mkdir -p /tmp/$1/etc
+	cp $1/assets/etc/hosts /tmp/$1/etc/hosts
+	cp $1/assets/etc/timezone /tmp/$1/etc/timezone
+	tar -C /tmp/$1 -xf /tmp/${1}.tar
+	ls /tmp/$1/ | xargs tar -C /tmp/$1 -czf ${1}.tar.gz 
+	rm -rf /tmp/$1
+"
+
+if [ "$(uname)" == "Darwin" ]; then
+  sudo bash -c "$make_tarball"
+  sudo chmod a+rw ${1}.tar.gz
+else
+  bash -c "$make_tarball"
+fi

cflinuxfs2/build/install-packages.sh

@@ -155,3 +155,5 @@ apt_get dist-upgrade
 apt_get install $packages_copied_from_lucid_script $packages_from_lucid_debootstrap $packages_copied_from_diego_trusty_script ubuntu-minimal
 
 apt-get clean
+
+rm -rf /usr/share/doc/* /usr/share/man/* /usr/share/groff/* /usr/share/info/* /usr/share/lintian/* /usr/share/linda/*

cflinuxfs2/build/install-ruby.sh

@@ -10,6 +10,7 @@ fi
 git clone git://github.com/sstephenson/ruby-build.git /tmp/ruby-build
 pushd /tmp/ruby-build
   PREFIX=/usr/local ./install.sh
-  /usr/local/bin/ruby-build $RUBY_VERSION /usr
+  RUBY_CONFIGURE_OPTS=--disable-install-doc \
+    /usr/local/bin/ruby-build $RUBY_VERSION /usr
 popd
 rm -rf /tmp/ruby-build*

cflinuxfs2/cflinuxfs2_receipt

@@ -1,6 +1,6 @@
-Rootfs SHASUM: 46e3eb31e76b7fc11db31cf4e2f0a1039a8d05f9  cflinuxfs2/rootfs.tgz
-Docker Image: 72a99d2dbb84
-S3 ETag: b2ffd6edbdabdeed81bacfb47f54a9e0
+Rootfs SHASUM: 4b21db5f9cb1dc97ecf481c15ea1e89408c42833  cflinuxfs2.tar.gz
+Docker Image: 350078f1ed5f
+S3 ETag: ddbed958103d2c98e7b299624bac5eee
 
 Desired=Unknown/Install/Remove/Purge/Hold
 | Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend
@@ -444,7 +444,7 @@ ii  libxt6:amd64                        1:1.1.4-1                           amd6
 ii  libxvidcore4:amd64                  2:1.3.2-9ubuntu1                    amd64        Open source MPEG-4 video codec (library)
 ii  libyaml-0-2:amd64                   0.1.4-3ubuntu3.1                    amd64        Fast YAML 1.1 parser and emitter library
 ii  libyaml-dev:amd64                   0.1.4-3ubuntu3.1                    amd64        Fast YAML 1.1 parser and emitter library (development)
-ii  linux-libc-dev:amd64                3.13.0-46.75                        amd64        Linux Kernel Headers for development
+ii  linux-libc-dev:amd64                3.13.0-46.77                        amd64        Linux Kernel Headers for development
 ii  locales                             2.13+git20120306-12.1               all          common files for locale support
 ii  lockfile-progs                      0.1.17                              amd64        Programs for locking and unlocking files and mailboxes
 ii  login                               1:4.1.5.1-1ubuntu9                  amd64        system login tools

lucid64/Dockerfile

@@ -1,5 +1,7 @@
 FROM ubuntu:lucid
 
+RUN mkdir -p /tmp
+
 ADD build /tmp/build
 ADD assets /tmp/assets
 
@@ -8,13 +10,13 @@ RUN bash /tmp/build/install-packages.sh
 RUN bash /tmp/build/install-ruby.sh 1.9.3-p547
 RUN bash /tmp/build/configure-core-dump-directory.sh
 RUN bash /tmp/build/configure-firstboot.sh
-RUN bash \
+RUN bash -c '\
   cd /tmp; \
   wget http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz; \
   tar -zxvf yaml-0.1.6.tar.gz; \
   cd yaml-0.1.6; \
   ./configure; \
   make; \
-  make install
+  make install'
 
 RUN rm -rf /tmp/*

lucid64/build/install-packages.sh

@@ -147,3 +147,5 @@ apt_get dist-upgrade
 apt_get install $packages_copied_from_lucid_script $packages_from_debootstrap
 
 apt-get clean
+
+rm -rf /usr/share/doc/* /usr/share/man/* /usr/share/groff/* /usr/share/info/* /usr/share/lintian/* /usr/share/linda/*

lucid64/build/install-ruby.sh

@@ -7,9 +7,11 @@ if [ -z "$RUBY_VERSION" ]; then
     exit 1
 fi
 
+
 git clone git://github.com/sstephenson/ruby-build.git /tmp/ruby-build
 pushd /tmp/ruby-build
   PREFIX=/usr/local ./install.sh
-  /usr/local/bin/ruby-build $RUBY_VERSION /usr
+  RUBY_CONFIGURE_OPTS=--disable-install-doc \
+    /usr/local/bin/ruby-build $RUBY_VERSION /usr
 popd
 rm -rf /tmp/ruby-build*