From 980c5c480ff1486d37981b68dc7aa03c10f5c16e Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Tue, 19 Jan 2021 20:12:56 +0100 Subject: [PATCH] Rename master branch to main (#571) --- .github/workflows/ci.yml | 4 ++-- .github/workflows/docs.yml | 4 ++-- README.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 865ee8a..bf8a326 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b9bfd95..c50939f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -4,9 +4,9 @@ on: schedule: - cron: '0 0 * * 0' # At 00:00 every Sunday push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: diff --git a/README.md b/README.md index d530171..39d117b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # 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) -[![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) 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 -This repository tries to stay aligned with the latest version of the Elastic stack. The `master` branch tracks the -current major version (7.x). +This repository tries to stay aligned with the latest version of the Elastic stack. The `main` branch tracks the current +major version (7.x). 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.