KEYCLOAK-19766 Update the Docker image to remove problematic language…

… in the repository

CONTRIBUTING.md

@@ -14,7 +14,7 @@ Here's a quick checklist for a good PR, more details below:
 2. A JIRA associated with the PR
 3. One feature/change per PR
 4. One commit per PR
-5. PR rebased on master (`git rebase`, not `git pull`) 
+5. PR rebased on main (`git rebase`, not `git pull`) 
 5. Commit message is prefixed by JIRA number
 6. No changes to code not directly related to your PR
 7. Includes functional/integration test
@@ -68,10 +68,10 @@ your PR.
 
 ### Submitting your PR
 
-When preparing your PR make sure you have a single commit and your branch is rebased on the master branch from the 
+When preparing your PR make sure you have a single commit and your branch is rebased on the main branch from the 
 project repository.
 
-This means use the `git rebase` command and not `git pull` when integrating changes from master to your branch. See
+This means use the `git rebase` command and not `git pull` when integrating changes from main to your branch. See
 [Git Documentation](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) for more details.
 
 We require that you squash to a single commit. You can do this with the `git rebase -i HEAD~X` command where X

docs/pull_request_template.md

@@ -1,3 +1,3 @@
 <!---
-Please read https://github.com/keycloak/keycloak/blob/master/CONTRIBUTING.md and follow these guidelines when contributing to Keycloak
+Please read https://github.com/keycloak/keycloak/blob/main/CONTRIBUTING.md and follow these guidelines when contributing to Keycloak
 -->

server/README.md

@@ -486,9 +486,9 @@ This image extends the [`registry.access.redhat.com/ubi8-minimal`](https://acces
 
 It is possible to build Keycloak from a GitHub repository instead of downloading the official release. To do this set the `GITHUB_REPO` build argument to the GitHub repository name and optionally set the `GITHUB_BRANCH` build argument to the branch to build. For example:
 
-    docker build --build-arg GIT_REPO=keycloak/keycloak --build-arg GIT_BRANCH=master .
+    docker build --build-arg GIT_REPO=keycloak/keycloak --build-arg GIT_BRANCH=main .
 
-This will clone the repository then build Keycloak from source. If you don't include GIT_BRANCH it will use the `master` branch.
+This will clone the repository then build Keycloak from source. If you don't include GIT_BRANCH it will use the `main` branch.
 
 #### Download Keycloak from an alternative location
 

server/hooks/build

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-if [ "$SOURCE_BRANCH" == "master" ] && [[ "$IMAGE_NAME" == *:master ]]; then
+if [ "$SOURCE_BRANCH" == "main" ] && [[ "$IMAGE_NAME" == *:main ]]; then
     GIT_REPO="keycloak/keycloak"
-    GIT_BRANCH="master"
+    GIT_BRANCH="main"
 elif [[ "$IMAGE_NAME" == *:nightly-* ]]; then
     GIT_REPO="keycloak/keycloak"
     GIT_BRANCH=`echo $IMAGE_NAME | cut -d ':' -f 2 | sed 's|nightly-||'`

server/tools/build-keycloak.sh

@@ -6,7 +6,7 @@
 
 if [ "$GIT_REPO" != "" ]; then
     if [ "$GIT_BRANCH" == "" ]; then
-        GIT_BRANCH="master"
+        GIT_BRANCH="main"
     fi
 
     # Install Git
@@ -24,8 +24,8 @@ if [ "$GIT_REPO" != "" ]; then
     # Build
     cd /opt/jboss/keycloak-source
 
-    MASTER_HEAD=`git log -n1 --format="%H"`
-    echo "Keycloak from [build]: $GIT_REPO/$GIT_BRANCH/commit/$MASTER_HEAD"
+    MAIN_HEAD=`git log -n1 --format="%H"`
+    echo "Keycloak from [build]: $GIT_REPO/$GIT_BRANCH/commit/$MAIN_HEAD"
 
     $M2_HOME/bin/mvn -Pdistribution -pl distribution/server-dist -am -Dmaven.test.skip clean install