From 94e53442191e9867b7b524c80a1c7567683908ec Mon Sep 17 00:00:00 2001
From: deepzz0 <deepzz.qi@gmail.com>
Date: Sun, 2 Oct 2016 00:56:32 +0800
Subject: [PATCH] update

---
 .dockerignore   | 12 ++++++++++++
 .travis.yml     | 10 ++++++++++
 Dockerfile      |  9 ++-------
 build_docker.sh | 10 +---------
 4 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..c5e3e21
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,12 @@
+.git
+.git/**
+.dockerignore
+*.yml
+*.md
+.gitignore
+Dockerfile
+vendor
+vendor/**
+*.go
+*.sh
+setting
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index e69de29..04c10e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,10 @@
+language: go
+
+go:
+  - 1.4
+  - 1.5
+  - 1.6
+  - 1.7
+
+go_import_path:
+  
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a4d3583..01cac29 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,12 +4,7 @@ MAINTAINER deepzz <deepzz.qi@gmail.com>
 RUN apt-get update  
 RUN apt-get install -y ca-certificates
 
-ADD conf /eiblog/conf
-ADD static /eiblog/static
-ADD views /eiblog/views
-ADD eiblog /eiblog/eiblog
-
+COPY . /eiblog
 EXPOSE 9000
-
 WORKDIR /eiblog
-ENTRYPOINT ["./eiblog"]
\ No newline at end of file
+ENTRYPOINT ["./eiblog"]
diff --git a/build_docker.sh b/build_docker.sh
index d262755..f2b7379 100755
--- a/build_docker.sh
+++ b/build_docker.sh
@@ -1,18 +1,10 @@
 #!/bin/bash
 echo "go build..."
 CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build && \
-mkdir tmp && \
-cp -a conf tmp/conf && \
-cp -a static tmp/static && \
-cp -a views tmp/views && \
-cp eiblog tmp/eiblog && \
-cp Dockerfile tmp/Dockerfile && \
-cd tmp && \
+
 domain="registry.cn-hangzhou.aliyuncs.com" && \
 docker build -t $domain/deepzz/eiblog . && \
 read -p "是否上传到服务器(y/n):" word && \
 if  [ $word = "y" ] ;then
     docker push $domain/deepzz/eiblog
 fi
-cd .. 
-rm -rf tmp
\ No newline at end of file