diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..00a89c6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,36 @@ +language: bash +sudo: required +services: +- docker +before_install: +- openssl aes-256-cbc -K $encrypted_6cc8cff04075_key -iv $encrypted_6cc8cff04075_iv + -in .travis/id_rsa.enc -out ~/.ssh/id_rsa -d +- chmod 600 ~/.ssh/id_rsa +- export TZ='Asia/Shanghai' +- date +- git config --global user.name "khs1994" +- git config --global user.email "khs1994@khs1994.com" +script: +- docker run -it --rm -v $PWD:/srv/gitbook-src yeasy/docker_practice build +after_success: +- sudo chmod -R 777 _book +- cd _book +- git init +- git remote add origin "$REPO" +- git add . +- COMMIT=`date "+%F %T"` +- git commit -m "Travis CI Site updated $COMMIT" +- git push -f origin master:"$DEPLOY_BRANCH" +env: + global: + - DEPLOY_BRANCH: pages + # - DEPLOY_BRANCH: legacy-pages + - REPO: git@github.com:yeasy/docker_practice.git +addons: + ssh_known_hosts: + - github.com +branches: + only: + - master + - dev + # - docker-legacy diff --git a/.travis/id_rsa.enc b/.travis/id_rsa.enc new file mode 100644 index 0000000..5e45754 Binary files /dev/null and b/.travis/id_rsa.enc differ diff --git a/README.md b/README.md index eda4a42..ae352cc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Docker — 从入门到实践 -[![](https://img.shields.io/github/stars/yeasy/docker_practice.svg?style=social&label=Stars)](https://github.com/yeasy/docker_practice) [![](https://img.shields.io/docker/pulls/yeasy/docker_practice.svg)](https://store.docker.com/community/images/yeasy/docker_practice) [![](https://img.shields.io/github/release/yeasy/docker_practice/all.svg)](https://github.com/yeasy/docker_practice/releases) +[![](https://img.shields.io/github/stars/yeasy/docker_practice.svg?style=social&label=Stars)](https://github.com/yeasy/docker_practice) [![](https://img.shields.io/docker/pulls/yeasy/docker_practice.svg)](https://store.docker.com/community/images/yeasy/docker_practice) [![](https://travis-ci.org/yeasy/docker_practice.svg?branch=master)](https://travis-ci.org/yeasy/docker_practice) [![](https://img.shields.io/github/release/yeasy/docker_practice/all.svg)](https://github.com/yeasy/docker_practice/releases) 0.9-rc1(2017-11-30) diff --git a/docker-compose.yml b/docker-compose.yml index 200945d..ce69512 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ version: "3" services: - docker_practice: - build: ./.travis + server: + # build: ./.travis image: yeasy/docker_practice:latest ports: - 4000:4000 @@ -17,3 +17,18 @@ services: - .travis/conf.d/default.conf:/etc/nginx/conf.d/default.conf ports: - 4000:4000 + + build: + image: yeasy/docker_practice:latest + volumes: + - ./:/srv/gitbook-src + command: build + + development: + build: ./.travis + image: yeasy/docker_practice:development + ports: + - 4000:4000 + volumes: + - ./:/srv/gitbook-src + command: server