From 80027819bd67acee0b649b395db5524f7f383d68 Mon Sep 17 00:00:00 2001
From: Shuai Lin <linshuai2012@gmail.com>
Date: Fri, 25 Nov 2016 15:12:22 +0800
Subject: [PATCH] Add more image building steps in travis tests.

---
 .travis.yml    | 2 +-
 image/Makefile | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8c08706..c62889b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ install:
   - echo "Nothing to install"
 
 script:
-  - cd image && make base && make server && cd ..
+  - cd image && make base squash-base server && cd ..
   - cp samples/server.conf bootstrap/bootstrap.conf
   - sudo ./launcher bootstrap
   - sudo ./launcher start && sleep 10
diff --git a/image/Makefile b/image/Makefile
index 9b4d7ee..2a44f22 100644
--- a/image/Makefile
+++ b/image/Makefile
@@ -12,13 +12,13 @@ all:
 base:
 	cd base && docker build -t $(base_image) .
 
-server:
-	cd seafile && docker build -t $(server_image) .
-
 squash-base:
 	docker-squash --verbose --tag $(base_image_squashed) $(base_image)
 	docker tag $(base_image_squashed) $(base_image)
 
+server:
+	cd seafile && docker build -t $(server_image) .
+
 push:
 	docker push $(base_image)
 	docker push $(server_image)