Merge pull request #72 from Islandora-Devops/master-main-rename

Master -> Main Rename
Islandora-Devops · Aug 31, 2020 · 92404df · 92404df
2 parents f8d1e8e + a42e985
commit 92404df
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -2,7 +2,7 @@ name: CI
 on: 
   push:
     branches:
-      - master
+      - main
 jobs:
   build:
     name: Build and Push Docker Images

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -2,7 +2,7 @@ name: CI
 on:
   pull_request:
     branches:
-      - master
+      - main
 jobs:
   build:
     name: Build Docker Images

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # ISLE: Docker Prototype <!-- omit in toc -->
 
 [![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](./LICENSE)
-![CI](https://github.com/Islandora-Devops/isle-buildkit/workflows/CI/badge.svg?branch=master)
+![CI](https://github.com/Islandora-Devops/isle-buildkit/workflows/CI/badge.svg?branch=main)
 
 - [Introduction](#introduction)
 - [Requirements](#requirements)
@@ -408,4 +408,4 @@ failed to solve with frontend dockerfile.v0: failed to solve with frontend gatew
 [Overlay2](https://docs.docker.com/storage/storagedriver/overlayfs-driver/#configure-docker-with-the-overlay-or-overlay2-storage-driver)
 filesystem with Docker. If that doesn't work trying building [without BuildKit](#building-without-buildkit).
 
-[Buildkit]: https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/experimental.md
+[Buildkit]: https://github.com/moby/buildkit/blob/main/frontend/dockerfile/docs/experimental.md
diff --git a/crayfish/README.md b/crayfish/README.md
@@ -28,4 +28,4 @@ additional settings, volumes, ports, etc.
 | :------------------- | :--------------- | :-------- | :---------- |
 | JWT_ADMIN_TOKEN      | /jwt/admin/token | islandora | JWT Token   |
 
-[Crayfish]: https://github.com/Islandora/Crayfish/tree/master
+[Crayfish]: https://github.com/Islandora/Crayfish/tree/main
diff --git a/fcrepo/rootfs/etc/confd/templates/fcrepo-config.xml.tmpl b/fcrepo/rootfs/etc/confd/templates/fcrepo-config.xml.tmpl
@@ -11,7 +11,7 @@
     http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
-    <!-- Master context for fcrepo4. -->
+    <!-- main context for fcrepo4. -->
 
     <!-- Context that supports the actual ModeShape JCR itself -->
     <context:property-placeholder/>

diff --git a/gemini/README.md b/gemini/README.md
@@ -23,4 +23,4 @@ additional settings, volumes, ports, etc.
 | GEMINI_FCREPO_URL       | /gemini/fcrepo/url       | fcrepo/fcrepo/rest | Fcrepo Rest API URL                                                                               |
 | GEMINI_LOG_LEVEL        | /gemini/log/level        | debug              | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none |
 
-[Gemini]: https://github.com/Islandora/Crayfish/tree/master/Gemini
+[Gemini]: https://github.com/Islandora/Crayfish/tree/main/Gemini
diff --git a/gemini/rootfs/etc/confd/templates/config.yaml.tmpl b/gemini/rootfs/etc/confd/templates/config.yaml.tmpl
@@ -13,7 +13,7 @@ syn:
   enable: true
   # Path to the syn config file for authentication.
   # example can be found here:
-  # https://github.com/Islandora/Syn/blob/master/conf/syn-settings.example.xml
+  # https://github.com/Islandora/Syn/blob/main/conf/syn-settings.example.xml
   config: /var/www/crayfish/syn-settings.xml
 db.options:
   driver: {{ getv "/db/driver" "pdo_mysql" }}

diff --git a/homarus/README.md b/homarus/README.md
@@ -14,4 +14,4 @@ additional settings, volumes, ports, etc.
 | :------------------- | :----------------- | :------ | :------------------------------------------------------------------------------------------------ |
 | HOMARUS_LOG_LEVEL    | /homarus/log/level | debug   | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none |
 
-[Homarus]: https://github.com/Islandora/Crayfish/tree/master/Homarus
+[Homarus]: https://github.com/Islandora/Crayfish/tree/main/Homarus
diff --git a/homarus/rootfs/etc/confd/templates/config.yaml.tmpl b/homarus/rootfs/etc/confd/templates/config.yaml.tmpl
@@ -36,5 +36,5 @@ syn:
   enable: True
   # Path to the syn config file for authentication.
   # example can be found here:
-  # https://github.com/Islandora/Syn/blob/master/conf/syn-settings.example$
+  # https://github.com/Islandora/Syn/blob/main/conf/syn-settings.example$
   config: /var/www/crayfish/syn-settings.xml
diff --git a/houdini/README.md b/houdini/README.md
@@ -14,4 +14,4 @@ additional settings, volumes, ports, etc.
 | :------------------- | :----------------- | :------ | :------------------------------------------------------------------------------------------------ |
 | HOUDINI_LOG_LEVEL    | /houdini/log/level | debug   | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none |
 
-[Houdini]: https://github.com/Islandora/Crayfish/tree/master/Houdini
+[Houdini]: https://github.com/Islandora/Crayfish/tree/main/Houdini
diff --git a/hypercube/README.md b/hypercube/README.md
@@ -15,4 +15,4 @@ additional settings, volumes, ports, etc.
 | HYPERCUBE_FCREPO_URL | /hypercube/fcrepo/url | fcrepo/fcrepo/rest | Fcrepo Rest API URL                                                                               |
 | HYPERCUBE_LOG_LEVEL  | /hypercube/log/level  | debug              | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none |
 
-[Hypercube]: https://github.com/Islandora/Crayfish/tree/master/Hypercube
+[Hypercube]: https://github.com/Islandora/Crayfish/tree/main/Hypercube
diff --git a/hypercube/rootfs/etc/confd/templates/config.yaml.tmpl b/hypercube/rootfs/etc/confd/templates/config.yaml.tmpl
@@ -15,5 +15,5 @@ syn:
   enable: true
   # Path to the syn config file for authentication.
   # example can be found here:
-  # https://github.com/Islandora/Syn/blob/master/conf/syn-settings.example.xml
+  # https://github.com/Islandora/Syn/blob/main/conf/syn-settings.example.xml
   config: /var/www/crayfish/syn-settings.xml
diff --git a/milliner/README.md b/milliner/README.md
@@ -17,4 +17,4 @@ additional settings, volumes, ports, etc.
 | MILLINER_GEMINI_URL  | /milliner/gemini/url | gemini:8000        | Gemini URL                                                                                        |
 | MILLINER_LOG_LEVEL   | /milliner/log/level  | debug              | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none |
 
-[Milliner]: https://github.com/Islandora/Crayfish/tree/master/Milliner
+[Milliner]: https://github.com/Islandora/Crayfish/tree/main/Milliner
diff --git a/milliner/rootfs/etc/confd/templates/config.yaml.tmpl b/milliner/rootfs/etc/confd/templates/config.yaml.tmpl
@@ -23,5 +23,5 @@ syn:
   enable: false
   # Path to the syn config file for authentication.
   # example can be found here:
-  # https://github.com/Islandora/Syn/blob/master/conf/syn-settings.example.xml
+  # https://github.com/Islandora/Syn/blob/main/conf/syn-settings.example.xml
   config: /var/www/crayfish/syn-settings.xml
diff --git a/recast/README.md b/recast/README.md
@@ -17,4 +17,4 @@ additional settings, volumes, ports, etc.
 | RECAST_GEMINI_URL    | /recast/gemini/url | gemini:8000        | Gemini URL                                                                                        |
 | RECAST_LOG_LEVEL     | /recast/log/level  | debug              | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none |
 
-[Recast]: https://github.com/Islandora/Crayfish/tree/master/Recast
+[Recast]: https://github.com/Islandora/Crayfish/tree/main/Recast
diff --git a/recast/rootfs/etc/confd/templates/config.yaml.tmpl b/recast/rootfs/etc/confd/templates/config.yaml.tmpl
@@ -19,7 +19,7 @@ syn:
   enable: false
   # Path to the syn config file for authentication.
   # example can be found here:
-  # https://github.com/Islandora/Syn/blob/master/conf/syn-settings.example.xml
+  # https://github.com/Islandora/Syn/blob/main/conf/syn-settings.example.xml
   config: /var/www/crayfish/syn-settings.xml
 
 # Add namespace prefixes used by Fedora for recast service
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: CI @@
     on:
       push:
         branches:
-          - master
+          - main
     jobs:
       build:
         name: Build and Push Docker Images
@@ Expand Down @@