Skip to content

Commit c075122

Browse files
committed
Update project docker image name #416
1 parent 593a0c3 commit c075122

File tree

6 files changed

+19
-15
lines changed

6 files changed

+19
-15
lines changed

.travis.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,20 @@ script:
1717

1818
after_success:
1919
- sudo chmod -R 777 _book
20-
- echo "FROM nginx:1.13.8-alpine" >> Dockerfile
20+
21+
- echo "FROM nginx:alpine" >> Dockerfile
2122
- echo "COPY _book /usr/share/nginx/html" >> Dockerfile
23+
2224
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
23-
- docker build -t dockerpracticecn/docker_practice .
24-
- docker run -dit --rm -p 4000:80 dockerpracticecn/docker_practice
25+
26+
- docker build -t dockerpracticesig/docker_practice .
27+
- docker run -dit --rm -p 4000:80 dockerpracticesig/docker_practice
28+
2529
- sleep 5
2630
- curl 127.0.0.1:4000
27-
- docker push dockerpracticecn/docker_practice
31+
32+
- docker push dockerpracticesig/docker_practice
33+
2834
- cd _book
2935
- git init
3036
- git remote add origin "$REPO"

.travis/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:9-alpine
1+
FROM node:alpine
22

33
ENV TZ=Asia/Shanghai
44

.travis/book.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"-livereload",
1212
"image-captions",
1313
"github",
14-
"page-treeview",
14+
"page-treeview@2.9.8",
1515
"editlink"
1616
],
1717
"pluginsConfig": {

CHANGELOG.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
## 主要修订记录
22

3-
* 1.1.0 2019-06-30
3+
* 1.1.0 2019-12-31
4+
* 全面支持 v19.x 新版本
45
* 增加 `BuildKit`
56
* 增加 `docker manifest` 命令使用说明
67
* 移除 `Ubuntu 14.04` `Debian 8` `Debian 7`
7-
8+
89
* 1.0.0: 2018-12-31
910
* 全面支持 v18.x 新版本
1011
* 添加如何调试 Docker

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
* 在线阅读:[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)
2020
* 下载:[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)
21-
* [离线阅读 `$ 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)
21+
* [离线阅读 `$ 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)
2222
* [英文翻译](https://github.com/yeasy/docker_practice/issues/363)
2323

2424
Docker 自身仍在快速发展中,生态环境也在蓬勃成长。建议初学者使用最新稳定版本的 Docker 进行学习实践。欢迎 [参与项目维护](CONTRIBUTING.md)

docker-compose.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: "3"
2+
23
services:
34

45
# $ docker-compose up server => up a server,Only Support Linux or macOS
5-
66
server:
77
image: yeasy/docker_practice:latest
88
ports:
@@ -19,13 +19,10 @@ services:
1919
- ./:/srv/gitbook-src
2020
command: build
2121

22-
# $ docker run -it --rm -p 4000:80 dockerpracticecn/docker_practice
23-
24-
# $ docker up offline
25-
22+
# $ docker run -it --rm -p 4000:80 dockerpracticesig/docker_practice
2623
offline:
2724
# this image build by travis ci
28-
image: dockerpracticecn/docker_practice
25+
image: dockerpracticesig/docker_practice
2926
ports:
3027
- 4000:80
3128

0 commit comments

Comments
 (0)