From 034aefbea396146dc784fd9957b28fd052cbd302 Mon Sep 17 00:00:00 2001 From: Claudia Beresford Date: Fri, 28 Apr 2017 13:39:32 +0100 Subject: [PATCH] Update playground [finishes #144368947] --- playground/config.yml | 8 ++++++-- playground/privileged_config.yml | 7 +++++-- playground/provision.sh | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/playground/config.yml b/playground/config.yml index 0efdc0aac..9febdb51d 100644 --- a/playground/config.yml +++ b/playground/config.yml @@ -1,7 +1,8 @@ store_path: /var/lib/grootfs/btrfs driver: btrfs btrfs_bin: /bin/btrfs -drax_bin: /home/ubuntu/drax +tardis_bin: /usr/local/bin/tardis +drax_bin: /usr/local/bin/drax newuidmap_bin: /usr/local/bin/newuidmap newgidmap_bin: /usr/local/bin/newgidmap log_level: debug @@ -12,10 +13,13 @@ clean: ignore_images: [] create: insecure_registries: [] - with_clean: true + with_clean: false + json: false + without_mount: false uid_mappings: - "0:4294967294:1" - "1:1:4294967293" gid_mappings: - "0:4294967294:1" - "1:1:4294967293" + diff --git a/playground/privileged_config.yml b/playground/privileged_config.yml index 9eed09845..c4e982794 100644 --- a/playground/privileged_config.yml +++ b/playground/privileged_config.yml @@ -1,7 +1,8 @@ store_path: /var/lib/grootfs/btrfs driver: btrfs btrfs_bin: /bin/btrfs -drax_bin: /home/ubuntu/drax +tardis_bin: /usr/local/bin/tardis +drax_bin: /usr/local/bin/drax newuidmap_bin: /usr/local/bin/newuidmap newgidmap_bin: /usr/local/bin/newgidmap log_level: debug @@ -12,4 +13,6 @@ clean: ignore_images: [] create: insecure_registries: [] - with_clean: true + with_clean: false + json: false + without_mount: false diff --git a/playground/provision.sh b/playground/provision.sh index d2ca0ed95..4904971f3 100644 --- a/playground/provision.sh +++ b/playground/provision.sh @@ -65,8 +65,9 @@ install_groot() { pushd $HOME/go/src/code.cloudfoundry.org/grootfs make deps make - cp {grootfs,drax} /usr/local/bin + cp {grootfs,drax,tardis} /usr/local/bin chmod u+s /usr/local/bin/drax + chmod u+s /usr/local/bin/tardis cp hack/{quick-setup,cleanup-store} /usr/local/bin popd }