Fixed travis ci.

This commit is contained in:
Shuai Lin 2016-11-25 16:13:06 +08:00
parent f826ea3d0f
commit 10b045f50b
2 changed files with 8 additions and 8 deletions

View file

@ -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"

View file

@ -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: