From a1b5935fa3aeee0f4a63402d57bfc4b3be8b7ae3 Mon Sep 17 00:00:00 2001 From: lifei6671 Date: Wed, 18 Jul 2018 17:56:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AD=E6=96=87=E5=AD=97?= =?UTF-8?q?=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 +- Dockerfile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95c72389..e6f7a489 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ script: before_deploy: - sudo apt-get -qq update - dep ensure -v && CGO_ENABLED=1 GOARCH=amd64 GOOS=linux go build -o mindoc_linux_amd64 -ldflags="-w -X github.com/lifei6671/mindoc/conf.VERSION=$TRAVIS_TAG -X 'github.com/lifei6671/mindoc/conf.BUILD_TIME=`date`' -X 'conf.GO_VERSION=`github.com/lifei6671/mindoc/go version`'" - - rm -rf commands controllers models modules data routers tasks vendor docs search utils graphics .git Godeps uploads/* .gitignore .travis.yml Dockerfile Gopkg.toml LICENSE main.go README.md conf/enumerate.go conf/mail.go install.lock *.md + - rm -rf simsun.ttc start.sh commands controllers models modules data routers tasks vendor docs search utils graphics .git Godeps uploads/* .gitignore .travis.yml Dockerfile Gopkg.toml LICENSE main.go README.md conf/enumerate.go conf/mail.go install.lock *.md - cp conf/app.conf.example conf/app.conf - zip -r mindoc_linux_amd64.zip conf static uploads views lib mindoc_linux_amd64 diff --git a/Dockerfile b/Dockerfile index f3c90fd5..81f7bd28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,13 +27,15 @@ ENV PATH $PATH:/opt/calibre/bin RUN curl -Lo /var/linux-installer.py https://download.calibre-ebook.com/linux-installer.py -RUN mkdir -p /go/src/github.com/lifei6671/ && cd /go/src/github.com/lifei6671/ && git clone https://github.com/lifei6671/mindoc.git && cd mindoc +#RUN mkdir -p /go/src/github.com/lifei6671/ && cd /go/src/github.com/lifei6671/ && git clone https://github.com/lifei6671/mindoc.git && cd mindoc + +ADD . /go/src/github.com/lifei6671/mindoc WORKDIR /go/src/github.com/lifei6671/mindoc RUN go get -u github.com/golang/dep/cmd/dep && dep ensure && \ CGO_ENABLE=1 go build -v -o mindoc_linux_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" && \ - rm -rf commands controllers models modules routers tasks vendor docs search data utils graphics .git Godeps uploads/* .gitignore .travis.yml Dockerfile gide.yaml LICENSE main.go README.md conf/enumerate.go conf/mail.go install.lock + rm -rf commands controllers models modules routers tasks vendor docs search data utils graphics .git Godeps uploads/* .gitignore .travis.yml Dockerfile gide.yaml LICENSE main.go README.md conf/enumerate.go conf/mail.go install.lock simsun.ttc ADD start.sh /go/src/github.com/lifei6671/mindoc