diff --git a/.travis.yml b/.travis.yml index de0aad397..e3e9d033e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,14 +17,20 @@ script: after_success: - sudo chmod -R 777 _book -- echo "FROM nginx:1.13.8-alpine" >> Dockerfile + +- echo "FROM nginx:alpine" >> Dockerfile - echo "COPY _book /usr/share/nginx/html" >> Dockerfile + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin -- docker build -t dockerpracticecn/docker_practice . -- docker run -dit --rm -p 4000:80 dockerpracticecn/docker_practice + +- docker build -t dockerpracticesig/docker_practice . +- docker run -dit --rm -p 4000:80 dockerpracticesig/docker_practice + - sleep 5 - curl 127.0.0.1:4000 -- docker push dockerpracticecn/docker_practice + +- docker push dockerpracticesig/docker_practice + - cd _book - git init - git remote add origin "$REPO" diff --git a/.travis/Dockerfile b/.travis/Dockerfile index 0a2315b8c..cee1e5e2b 100644 --- a/.travis/Dockerfile +++ b/.travis/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9-alpine +FROM node:alpine ENV TZ=Asia/Shanghai diff --git a/.travis/book.json b/.travis/book.json index c9f0ea4bc..95d0b6758 100644 --- a/.travis/book.json +++ b/.travis/book.json @@ -11,7 +11,7 @@ "-livereload", "image-captions", "github", - "page-treeview", + "page-treeview@2.9.8", "editlink" ], "pluginsConfig": { diff --git a/CHANGELOG.md b/CHANGELOG.md index 70430f96e..055b45edc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ ## 主要修订记录 -* 1.1.0 2019-06-30 +* 1.1.0 2019-12-31 + * 全面支持 v19.x 新版本 * 增加 `BuildKit` * 增加 `docker manifest` 命令使用说明 * 移除 `Ubuntu 14.04` `Debian 8` `Debian 7` - + * 1.0.0: 2018-12-31 * 全面支持 v18.x 新版本 * 添加如何调试 Docker diff --git a/README.md b/README.md index 9c89555f0..3185e3035 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ * 在线阅读:[GitBook](https://yeasy.gitbooks.io/docker_practice/content/),[Github](https://github.com/yeasy/docker_practice/blob/master/SUMMARY.md),[GitBook 国内镜像](https://docker_practice.gitee.io/),[GitBook 英文版国内镜像](https://docker_practice.gitee.io/us_en),[国内镜像](https://github.com/yeasy/docker_practice/wiki/%E9%A1%B9%E7%9B%AE%E5%9B%BD%E5%86%85%E9%95%9C%E5%83%8F) * 下载:[pdf](https://github.com/yeasy/docker_practice/wiki/%E4%B8%8B%E8%BD%BD),[epub](https://github.com/yeasy/docker_practice/wiki/%E4%B8%8B%E8%BD%BD) -* [离线阅读 `$ docker run -it --rm -p 4000:80 dockerpracticecn/docker_practice`](https://github.com/yeasy/docker_practice/wiki/%E7%A6%BB%E7%BA%BF%E9%98%85%E8%AF%BB%E5%8A%9F%E8%83%BD%E8%AF%A6%E8%A7%A3) +* [离线阅读 `$ docker run -it --rm -p 4000:80 dockerpracticesig/docker_practice`](https://github.com/yeasy/docker_practice/wiki/%E7%A6%BB%E7%BA%BF%E9%98%85%E8%AF%BB%E5%8A%9F%E8%83%BD%E8%AF%A6%E8%A7%A3) * [英文翻译](https://github.com/yeasy/docker_practice/issues/363) Docker 自身仍在快速发展中,生态环境也在蓬勃成长。建议初学者使用最新稳定版本的 Docker 进行学习实践。欢迎 [参与项目维护](CONTRIBUTING.md)。 diff --git a/docker-compose.yml b/docker-compose.yml index 509f2654f..624994749 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ version: "3" + services: # $ docker-compose up server => up a server,Only Support Linux or macOS - server: image: yeasy/docker_practice:latest ports: @@ -19,13 +19,10 @@ services: - ./:/srv/gitbook-src command: build - # $ docker run -it --rm -p 4000:80 dockerpracticecn/docker_practice - - # $ docker up offline - + # $ docker run -it --rm -p 4000:80 dockerpracticesig/docker_practice offline: # this image build by travis ci - image: dockerpracticecn/docker_practice + image: dockerpracticesig/docker_practice ports: - 4000:80