diff --git a/Jenkinsfile.docs b/Jenkinsfile.docs index c65a528..87edb09 100644 --- a/Jenkinsfile.docs +++ b/Jenkinsfile.docs @@ -26,7 +26,7 @@ pipeline { } sh 'mkdir galasa.dev' dir('galasa.dev') { - git(url: 'https://github.com/galasa-dev/galasa.dev.git', branch: "master") + git(url: 'https://github.com/galasa-dev/galasa.dev.git', branch: "main") } } } diff --git a/Jenkinsfile.manifests b/Jenkinsfile.manifests index 068a350..f8933bf 100644 --- a/Jenkinsfile.manifests +++ b/Jenkinsfile.manifests @@ -35,7 +35,7 @@ pipeline { stage('manifest-boot-embedded-latest') { when { - environment name: 'GIT_BRANCH', value: 'origin/master' + environment name: 'GIT_BRANCH', value: 'origin/main' } agent { label 'docker-amd64' @@ -64,7 +64,7 @@ pipeline { stage('manifest-ras-couchdb-init-latest') { when { - environment name: 'GIT_BRANCH', value: 'origin/master' + environment name: 'GIT_BRANCH', value: 'origin/main' } agent { label 'docker-amd64' @@ -93,7 +93,7 @@ pipeline { stage('manifest-resources-latest') { when { - environment name: 'GIT_BRANCH', value: 'origin/master' + environment name: 'GIT_BRANCH', value: 'origin/main' } agent { label 'docker-amd64' @@ -122,7 +122,7 @@ pipeline { stage('manifest-ibm-boot-latest') { when { - environment name: 'GIT_BRANCH', value: 'origin/master' + environment name: 'GIT_BRANCH', value: 'origin/main' } agent { label 'docker-amd64' @@ -138,7 +138,7 @@ pipeline { stage('manifest-api-bootstrap-latest') { when { - environment name: 'GIT_BRANCH', value: 'origin/master' + environment name: 'GIT_BRANCH', value: 'origin/main' } agent { label 'docker-amd64' diff --git a/README.md b/README.md index 384b603..4d53588 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ Other repositories are available via [GitHub](https://github.com/galasa-dev). If you are interested in the development of Galasa, take a look at the documentation and feel free to post a question on [Galasa Slack channel](https://galasa.slack.com) or raise new ideas / features / bugs etc. as issues on [GitHub](https://github.com/galasa-dev/projectmanagement). -Take a look at the [contribution guidelines](https://github.com/galasa-dev/projectmanagement/blob/master/contributing.md). +Take a look at the [contribution guidelines](https://github.com/galasa-dev/projectmanagement/blob/main/contributing.md). ## License -This code is under the [Eclipse Public License 2.0](https://github.com/galasa-dev/maven/blob/master/LICENSE). +This code is under the [Eclipse Public License 2.0](https://github.com/galasa-dev/maven/blob/main/LICENSE). diff --git a/runtime/docker/pull.sh b/runtime/docker/pull.sh index 4cba26a..8228b49 100755 --- a/runtime/docker/pull.sh +++ b/runtime/docker/pull.sh @@ -11,7 +11,7 @@ docker pull couchdb:2 echo "Pulling couchdb init" docker pull galasa/galasa-ras-couchdb-init-amd64:@dockerVersion@ -echo "Pulling api master server" +echo "Pulling api main server" docker pull galasa/galasa-api-bootstrap-amd64:@dockerVersion@ echo "Pulling boot"