Skip to content

Commit

Permalink
Update project docker image name #416
Browse files Browse the repository at this point in the history
  • Loading branch information
khs1994 committed Aug 31, 2019
1 parent 593a0c3 commit c075122
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 15 deletions.
14 changes: 10 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .travis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:9-alpine
FROM node:alpine

ENV TZ=Asia/Shanghai

Expand Down
2 changes: 1 addition & 1 deletion .travis/book.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"-livereload",
"image-captions",
"github",
"page-treeview",
"page-treeview@2.9.8",
"editlink"
],
"pluginsConfig": {
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)。
Expand Down
9 changes: 3 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: "3"

services:

# $ docker-compose up server => up a serverOnly Support Linux or macOS

server:
image: yeasy/docker_practice:latest
ports:
Expand All @@ -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

Expand Down

0 comments on commit c075122

Please sign in to comment.