From e60174cfa035d591b7bd36c34c7abe8581e9a56b Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Mon, 19 Jul 2021 14:27:20 -0300 Subject: [PATCH] discourse/discourse moved from master to main --- README.md | 2 +- image/README.md | 2 +- templates/web.template.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index be05ba8..fc6ca29 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The simplest way to get started is via the **standalone** template, which can be installed in 30 minutes or less. For detailed install instructions, see -https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md +https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md ### Directory Structure diff --git a/image/README.md b/image/README.md index 007f1f3..d291588 100644 --- a/image/README.md +++ b/image/README.md @@ -21,7 +21,7 @@ All of the dependencies for running Discourse. This includes runit, postgres, n ### discourse_dev ([discourse/discourse_dev](https://hub.docker.com/r/discourse/discourse_dev/)) -Adds redis and postgres just like the "standalone" template for Discourse in order to have an all-in-one container for development. Note that you are expected to mount your local discourse source directory to `/src`. See [the README in GitHub's discourse/bin/docker](https://github.com/discourse/discourse/tree/master/bin/docker/) for utilities that help with this. +Adds redis and postgres just like the "standalone" template for Discourse in order to have an all-in-one container for development. Note that you are expected to mount your local discourse source directory to `/src`. See [the README in GitHub's discourse/bin/docker](https://github.com/discourse/discourse/tree/main/bin/docker/) for utilities that help with this. Note that the discourse user is granted "sudo" permission without asking for a password in the discourse_dev image. This is to facilitate the command-line Docker tools in discourse proper that run commands as the discourse user. diff --git a/templates/web.template.yml b/templates/web.template.yml index 83b84b2..04d1652 100644 --- a/templates/web.template.yml +++ b/templates/web.template.yml @@ -88,7 +88,7 @@ run: cmd: - git reset --hard - git clean -f - - git remote set-branches --add origin master + - git remote set-branches --add origin main - git remote set-branches origin $version - git fetch --depth 1 origin $version - git checkout $version -- 2.25.1