diff --git a/jobs/garden/spec b/jobs/garden/spec index 25f889c79..e2ce9655b 100644 --- a/jobs/garden/spec +++ b/jobs/garden/spec @@ -12,6 +12,7 @@ packages: - runc - shadow - busybox + - busybox-tar - tar properties: diff --git a/manifests/garden-groot-lite.yml b/manifests/garden-groot-lite.yml index d2dd97ccb..983a1f3bb 100644 --- a/manifests/garden-groot-lite.yml +++ b/manifests/garden-groot-lite.yml @@ -7,7 +7,7 @@ director_uuid: <%= `bosh target lite > /dev/null 2>&1 && bosh status --uuid` %> releases: - name: garden-runc version: latest - - name: grootfs + - name: grootfs-release version: latest jobs: @@ -15,7 +15,7 @@ jobs: instances: 1 templates: - name: grootfs - release: grootfs + release: grootfs-release - name: garden release: garden-runc resource_pool: garden @@ -23,6 +23,7 @@ jobs: - name: garden properties: garden: + default_container_rootfs: /var/vcap/packages/busybox-tar/busybox.tar graph_cleanup_threshold_in_mb: 1024 listen_network: tcp listen_address: 0.0.0.0:7777 diff --git a/packages/busybox-tar/packaging b/packages/busybox-tar/packaging new file mode 100644 index 000000000..fef6886fa --- /dev/null +++ b/packages/busybox-tar/packaging @@ -0,0 +1,21 @@ +set -e -x + +# to generate a new busybox tarball: +# +# docker run -i -t -cidfile=busybox.cid busybox echo foo +# docker export $(cat busybox.cid) > busybox.tar.gz +# +# to add it to the release: +# +# cd garden-runc-release +# bosh add blob busybox.tar.gz busybox +# bosh upload blobs + +mkdir ${BOSH_INSTALL_TARGET}/busybox +tar zxf busybox/busybox.tar.gz -C ${BOSH_INSTALL_TARGET}/busybox +pushd ${BOSH_INSTALL_TARGET}/busybox + tar cf busybox.tar * +popd +mv ${BOSH_INSTALL_TARGET}/busybox/busybox.tar ${BOSH_INSTALL_TARGET}/busybox.tar +rm -rf ${BOSH_INSTALL_TARGET}/busybox + diff --git a/packages/busybox-tar/spec b/packages/busybox-tar/spec new file mode 100644 index 000000000..69161e3d6 --- /dev/null +++ b/packages/busybox-tar/spec @@ -0,0 +1,5 @@ +--- +name: busybox-tar + +files: + - busybox/busybox.tar.gz