Skip to content

Commit 0ea74db

Browse files
committed
update docker repo
1 parent 53b4786 commit 0ea74db

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ branches:
66
- master
77

88
install:
9-
- docker build -t johnwu/nginx .
9+
- docker build -t eswork/nginx .
1010

1111
script:
12-
- docker run --name nginx -d -p 30080:80 johnwu/nginx -c /etc/nginx/test.conf; sleep 5
12+
- docker run --name nginx -d -p 30080:80 eswork/nginx -c /etc/nginx/test.conf; sleep 5
1313
- docker ps -a | grep -q nginx
1414
- curl --retry 5 --retry-delay 5 -v http://127.0.0.1:30080/index.html
1515
- curl -v http://127.0.0.1:30080/purge/index.html

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
all: build
22

33
build:
4-
@docker build --tag=johnwu/nginx .
4+
@docker build --tag=eswork/nginx .
55

66
release: build
7-
@docker build --tag=johnwu/nginx:$(shell cat VERSION) .
7+
@docker build --tag=eswork/nginx:$(shell cat VERSION) .

README.md

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
[![Build Status](https://travis-ci.org/vla/docker-nginx.svg?branch=master)](https://travis-ci.org/vla/docker-nginx)
1+
[![Build Status](https://travis-ci.org/EsWork/docker-nginx.svg?branch=master)](https://travis-ci.org/EsWork/docker-nginx)
22

3-
# Supported tags and respective `Dockerfile` links
3+
## Supported tags and respective `Dockerfile` links
44

5-
- [`latest` , `1.10.3` (1.10.3/Dockerfile)](https://github.com/vla/docker-nginx/blob/master/Dockerfile)
5+
- [`latest` , `1.10.3` (1.10.3/Dockerfile)](https://github.com/EsWork/docker-nginx/blob/master/Dockerfile)
66

7-
# Introduction
7+
## Introduction
88

99
Nginx-1.10.3 镜像集成模块列表:
1010
- pagespeed
@@ -24,42 +24,43 @@ ARG WITH_PURGE=true
2424
ARG WITH_UPSTREAM_CHECK=true
2525
```
2626

27-
# Getting started
28-
2927
## Installation
28+
---
3029

31-
自动化构建镜像的可用[Dockerhub](https://hub.docker.com/r/johnwu/nginx)和推荐的安装方法
30+
自动化构建镜像的可用[Dockerhub](https://hub.docker.com/r/eswork/nginx)和推荐的安装方法
3231

3332
```bash
34-
docker pull johnwu/nginx:1.10.3
33+
docker pull eswork/nginx:1.10.3
3534
```
3635

3736
或者你可以自己构建镜像
3837

3938
```bash
40-
docker build -t johnwu/nginx github.com/vla/docker-nginx
39+
docker build -t eswork/nginx github.com/eswork/docker-nginx
4140
```
4241

4342
## Quickstart
43+
---
4444

4545
运行nginx:
4646

4747
```bash
4848
docker run --name nginx -d \
4949
-p 80:80 --restart=always \
50-
johnwu/nginx
50+
eswork/nginx
5151
```
5252

5353
或者您可以使用示例[docker-compose.yml](docker-compose.yml)文件启动容器
5454

5555
## Configuration
56+
---
5657

5758
自定义您的配置文件覆盖容器默认的`/etc/nginx/nginx.conf`配置
5859

5960
```bash
6061
docker run --name nginx -d \
6162
-v /some/nginx.conf:/etc/nginx/nginx.conf:ro \
62-
johnwu/nginx
63+
eswork/nginx
6364
```
6465

6566
挂载您自己的`sites-enabled`目录到`/etx/nginx/sites-enabled`
@@ -68,7 +69,7 @@ johnwu/nginx
6869
docker run --name nginx -d \
6970
-v /some/nginx.conf:/etc/nginx/nginx.conf:ro \
7071
-v /srv/docker/nginx/sites-enabled:/etc/nginx/sites-enabled \
71-
johnwu/nginx
72+
eswork/nginx
7273
```
7374

7475
重新加载的NGINX配置使用`kill -s HUP`发送到容器上
@@ -78,22 +79,24 @@ docker kill -s HUP nginx
7879
```
7980

8081
## Logs
82+
---
8183

8284
访问Nginx日志位于`/var/log/nginx`
8385
```bash
8486
docker exec -it nginx tail -f /var/log/nginx/access.log
8587
```
8688

87-
# Test
89+
## Test
90+
---
8891

89-
## 执行以下命令启动容器
92+
### 执行以下命令启动容器
9093

9194
```bash
9295
docker run -p 80:80 --name nginx -d \
93-
johnwu/nginx nginx -c /etc/nginx/test.conf
96+
eswork/nginx nginx -c /etc/nginx/test.conf
9497
```
9598

96-
## 地址测试
99+
### 测试地址
97100

98101

99102
先访问`http://localhost/index.html` ,然后再次访问`http://localhost/purge/index.html`会看到效果

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
nginx:
2-
image: johnwu/nginx:1.10.3
2+
image: eswork/nginx:1.10.3
33
ports:
44
- "80:80"
55
volumes:

0 commit comments

Comments
 (0)