Skip to content

Commit 001c523

Browse files
committed
chore: rename master branch to main
1 parent 4401220 commit 001c523

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/dockerhub.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- cron: '0 0 * * 1'
77
push:
88
branches:
9-
- master
9+
- main
1010
tags:
1111
- '*.*.*'
1212
paths:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build docker-gen from scratch
22
FROM golang:1.16-alpine as go-builder
33

4-
ARG VERSION=master
4+
ARG VERSION=main
55

66
WORKDIR /build
77

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ docker-gen
22
=====
33

44
![latest 0.7.6](https://img.shields.io/badge/latest-0.7.6-green.svg?style=flat)
5-
[![Build Status](https://travis-ci.org/jwilder/docker-gen.svg?branch=master)](https://travis-ci.org/jwilder/docker-gen)
5+
[![Build Status](https://travis-ci.org/jwilder/docker-gen.svg?branch=main)](https://travis-ci.org/jwilder/docker-gen)
66
![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)
77

88
`docker-gen` is a file generator that renders templates using docker container meta-data.
99

1010
It can be used to generate various kinds of files for:
1111

12-
* **Centralized logging** - [fluentd](https://github.com/jwilder/docker-gen/blob/master/templates/fluentd.conf.tmpl), logstash or other centralized logging tools that tail the containers JSON log file or files within the container.
13-
* **Log Rotation** - [logrotate](https://github.com/jwilder/docker-gen/blob/master/templates/logrotate.tmpl) files to rotate container JSON log files
14-
* **Reverse Proxy Configs** - [nginx](https://github.com/jwilder/docker-gen/blob/master/templates/nginx.tmpl), [haproxy](https://github.com/jwilder/docker-discover), etc. reverse proxy configs to route requests from the host to containers
12+
* **Centralized logging** - [fluentd](https://github.com/jwilder/docker-gen/blob/main/templates/fluentd.conf.tmpl), logstash or other centralized logging tools that tail the containers JSON log file or files within the container.
13+
* **Log Rotation** - [logrotate](https://github.com/jwilder/docker-gen/blob/main/templates/logrotate.tmpl) files to rotate container JSON log files
14+
* **Reverse Proxy Configs** - [nginx](https://github.com/jwilder/docker-gen/blob/main/templates/nginx.tmpl), [haproxy](https://github.com/jwilder/docker-discover), etc. reverse proxy configs to route requests from the host to containers
1515
* **Service Discovery** - Scripts (python, bash, etc..) to register containers within [etcd](https://github.com/jwilder/docker-register), hipache, etc..
1616

1717
===
@@ -66,7 +66,7 @@ $ docker run -d -p 80:80 --name nginx -v /tmp/nginx:/etc/nginx/conf.d -t nginx
6666
Fetch the template and start the docker-gen container with the shared volume:
6767
```
6868
$ mkdir -p /tmp/templates && cd /tmp/templates
69-
$ curl -o nginx.tmpl https://raw.githubusercontent.com/jwilder/docker-gen/master/templates/nginx.tmpl
69+
$ curl -o nginx.tmpl https://raw.githubusercontent.com/jwilder/docker-gen/main/templates/nginx.tmpl
7070
$ docker run -d --name nginx-gen --volumes-from nginx \
7171
-v /var/run/docker.sock:/tmp/docker.sock:ro \
7272
-v /tmp/templates:/etc/docker-gen/templates \

0 commit comments

Comments
 (0)