Skip to content

Commit 60bfba3

Browse files
authored
Update obsolete topics (#460)
Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
1 parent 20f02c0 commit 60bfba3

1 file changed

Lines changed: 9 additions & 14 deletions

File tree

MAINTAINING.md

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ How to use and maintain this project
33

44
All operations are automated as much as possible.
55

6-
- [Travis CI][3] is used only for tests.
76
- Generation of each `Dockerfile` and its context is automated via `Makefile`.
8-
9-
7+
- Maintain vX.Y branch for LTS
8+
- Deploy container images via GitHub Actions (except Windows container images)
109

1110
## Updating
1211

@@ -24,12 +23,7 @@ To update versions of images following steps are required:
2423
```bash
2524
make src-all
2625
```
27-
5. If `Dockerfile`s layout was changed somehow (major version change, for
28-
example), you should check [build triggers on Docker Hub][2] and
29-
[Travis CI configuration](.travis.yml), modify them as required
30-
BEFORE push to `master` branch.
31-
6. Push changes to `master` branch.
32-
26+
5. Push changes to `master` branch.
3327

3428
### Image versioning convensions
3529

@@ -50,9 +44,11 @@ To update versions of images following steps are required:
5044
2. Set `DOCKER_HUB_ORGS`, `DOCKER_HUB_REPOSITORY`, `DOCKER_HUB_USERNAME` and `DOCKER_HUB_ACCESS_TOKEN` as GitHub repository secrets.
5145
(e.g. `DOCKER_HUB_ORGS=fluent`, `DOCKER_HUB_REPOSITORY=fluentd` and so on)
5246
53-
3. Create tag to release it! (e.g. v1.18.0-1.0 for alpine,amd64,arm64 and armhf)
47+
3. Create tag to release it! (e.g. v1.18.0-1.0 for amd64,arm64 and armhf)
48+
1. If you deploy all images, tag `v<Fluentd version>-<image major version>.<image minor version>` (e.g. v1.19.1-1.0).
49+
2. If you deploy specific architecture image, tag `v<Fluentd version>-debian-[arm64(for aarch64 image)]-<image major version>.<image minor version>` (e.g. v1.19.1-debian-arm64-1.0).
5450
55-
Built tags for debian and alpine images will be published at [TAGS page](https://hub.docker.com/r/fluent/fluentd/tags).
51+
Built tags for debian images will be published at [TAGS page](https://hub.docker.com/r/fluent/fluentd/tags).
5652
5753
### Build and Publish Windows Server Core images
5854
@@ -109,13 +105,12 @@ make release-all
109105
```
110106

111107
It will build all existing `Dockerfile`s, tag them with proper tags
112-
([as `README.md` requires][4]) and push them to Docker Hub.
108+
([as `README.md` requires][3]) and push them to Docker Hub.
113109

114110

115111

116112

117113

118114
[1]: https://hub.docker.com/r/fluent/fluentd/tags
119115
[2]: https://hub.docker.com/r/fluent/fluentd/~/settings/automated-builds
120-
[3]: https://travis-ci.org/fluent/fluentd-docker-image
121-
[4]: README.md#supported-tags-and-respective-dockerfile-links
116+
[3]: README.md#supported-tags-and-respective-dockerfile-links

0 commit comments

Comments
 (0)