iac
/
docker-elk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename master branch to main (#571)

This commit is contained in:
Antoine Cotten 2021-01-19 20:12:56 +01:00 committed by GitHub
parent 747a6537f2
commit 980c5c480f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -2,9 +2,9 @@ name: CI
on: on:
push: push:
branches: [ master ] branches: [ main ]
pull_request: pull_request:
branches: [ master ] branches: [ main ]
jobs: jobs:

4
.github/workflows/docs.yml vendored
View File

@ -4,9 +4,9 @@ on:
schedule: schedule:
- cron: '0 0 * * 0' # At 00:00 every Sunday - cron: '0 0 * * 0' # At 00:00 every Sunday
push: push:
branches: [ master ] branches: [ main ]
pull_request: pull_request:
branches: [ master ] branches: [ main ]
jobs: jobs:

6
README.md
View File

@ -1,7 +1,7 @@
# Elastic stack (ELK) on Docker # Elastic stack (ELK) on Docker
[![Elastic Stack version](https://img.shields.io/badge/Elastic%20Stack-7.10.2-00bfb3?style=flat&logo=elastic-stack)](https://www.elastic.co/blog/category/releases) [![Elastic Stack version](https://img.shields.io/badge/Elastic%20Stack-7.10.2-00bfb3?style=flat&logo=elastic-stack)](https://www.elastic.co/blog/category/releases)
[![Build Status](https://github.com/deviantony/docker-elk/workflows/CI/badge.svg?branch=master)](https://github.com/deviantony/docker-elk/actions?query=workflow%3ACI+branch%3Amaster) [![Build Status](https://github.com/deviantony/docker-elk/workflows/CI/badge.svg?branch=main)](https://github.com/deviantony/docker-elk/actions?query=workflow%3ACI+branch%3Amain)
[![Join the chat at https://gitter.im/deviantony/docker-elk](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/deviantony/docker-elk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Join the chat at https://gitter.im/deviantony/docker-elk](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/deviantony/docker-elk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Run the latest version of the [Elastic stack][elk-stack] with Docker and Docker Compose. Run the latest version of the [Elastic stack][elk-stack] with Docker and Docker Compose.
@ -121,8 +121,8 @@ exclusively. Make sure the repository is cloned in one of those locations or fol
### Version selection ### Version selection
This repository tries to stay aligned with the latest version of the Elastic stack. The `master` branch tracks the This repository tries to stay aligned with the latest version of the Elastic stack. The `main` branch tracks the current
current major version (7.x). major version (7.x).
To use a different version of the core Elastic components, simply change the version number inside the `.env` file. If To use a different version of the core Elastic components, simply change the version number inside the `.env` file. If
you are upgrading an existing stack, please carefully read the note in the next section. you are upgrading an existing stack, please carefully read the note in the next section.