From 10b045f50b1cded58e0c3152bd5c5898372e5668 Mon Sep 17 00:00:00 2001 From: Shuai Lin Date: Fri, 25 Nov 2016 16:13:06 +0800 Subject: [PATCH] Fixed travis ci. --- ci/ci.sh | 14 +++++++------- image/Makefile | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/ci.sh b/ci/ci.sh index e3ffbf5..901b1dd 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -9,11 +9,11 @@ pip install docker-squash make base squash-base server ) -cp samples/server.conf bootstrap/bootstrap.conf +sudo cp samples/server.conf bootstrap/bootstrap.conf -./launcher bootstrap -./launcher start && sleep 10 -./launcher stop --skip-prereqs -./launcher start --docker-args "--memory 1g" && sleep 10 -./launcher restart -./launcher rebuild --docker-args "--memory 1g" +sudo ./launcher bootstrap +sudo ./launcher start && sleep 10 +sudo ./launcher stop --skip-prereqs +sudo ./launcher start --docker-args "--memory 1g" && sleep 10 +sudo ./launcher restart +sudo ./launcher rebuild --docker-args "--memory 1g" diff --git a/image/Makefile b/image/Makefile index 2a44f22..a2f8c43 100644 --- a/image/Makefile +++ b/image/Makefile @@ -13,7 +13,7 @@ base: cd base && docker build -t $(base_image) . squash-base: - docker-squash --verbose --tag $(base_image_squashed) $(base_image) + docker-squash --tag $(base_image_squashed) $(base_image) docker tag $(base_image_squashed) $(base_image) server: