Skip to content

Commit ae52e0a

Browse files
alhendricksonalhendrickson
committed
Rename master branch to main
1 parent bf237f9 commit ae52e0a

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

‎.github/workflows/docker-jupyter-hub.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: docker-jupyter-hub-hybrid-architecture
33
on:
44

55
push:
6-
branches: [ master ]
6+
branches: [ main ]
77
pull_request:
8-
branches: [ master ]
8+
branches: [ main ]
99

1010
release:
1111
types: [published]
@@ -68,12 +68,12 @@ jobs:
6868
6969
- name: set docker release tag name
7070
id: set_release_version
71-
if: ${{ env.RELEASE_VERSION != 'master' }}
71+
if: ${{ env.RELEASE_VERSION != 'main' }}
7272
run: echo "RELEASE_VERSION=${RELEASE_VERSION#?}" >> $GITHUB_ENV
7373

7474
- name: set docker release tag name
7575
id: set_release_version_latest
76-
if: ${{ env.RELEASE_VERSION == 'master' }}
76+
if: ${{ env.RELEASE_VERSION == 'main' }}
7777
run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
7878

7979
- name: set CPU architecture

‎.github/workflows/docker-jupyter-singleuser-gpu.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: docker-jupyter-singleuser-gpu
33
on:
44

55
push:
6-
branches: [ master ]
6+
branches: [ main ]
77
pull_request:
8-
branches: [ master ]
8+
branches: [ main ]
99

1010
release:
1111
types: [published]
@@ -40,7 +40,7 @@ jobs:
4040
- name: Git Sumbodule Update
4141
run: |
4242
git submodule update --init --recursive
43-
git pull --recurse-submodules origin master
43+
git pull --recurse-submodules origin main
4444
git submodule update --remote --recursive
4545
4646
- name: Log in to Docker Hub
@@ -68,12 +68,12 @@ jobs:
6868
6969
- name: set docker release tag name
7070
id: set_release_version
71-
if: ${{ env.RELEASE_VERSION != 'master' }}
71+
if: ${{ env.RELEASE_VERSION != 'main' }}
7272
run: echo "RELEASE_VERSION=${RELEASE_VERSION#?}" >> $GITHUB_ENV
7373

7474
- name: set docker release tag name
7575
id: set_release_version_latest
76-
if: ${{ env.RELEASE_VERSION == 'master' }}
76+
if: ${{ env.RELEASE_VERSION == 'main' }}
7777
run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
7878

7979
- name: set CPU architecture

‎.github/workflows/docker-jupyter-singleuser.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: docker-jupyter-singleuser
33
on:
44

55
push:
6-
branches: [ master ]
6+
branches: [ main ]
77
pull_request:
8-
branches: [ master ]
8+
branches: [ main ]
99

1010
release:
1111
types: [published]
@@ -49,7 +49,7 @@ jobs:
4949
- name: Git Sumbodule Update
5050
run: |
5151
git submodule update --init --recursive
52-
git pull --recurse-submodules origin master
52+
git pull --recurse-submodules origin main
5353
git submodule update --remote --recursive
5454
5555
- name: Log in to Docker Hub
@@ -77,12 +77,12 @@ jobs:
7777
7878
- name: set docker release tag name
7979
id: set_release_version
80-
if: ${{ env.RELEASE_VERSION != 'master' }}
80+
if: ${{ env.RELEASE_VERSION != 'main' }}
8181
run: echo "RELEASE_VERSION=${RELEASE_VERSION#?}" >> $GITHUB_ENV
8282

8383
- name: set docker release tag name
8484
id: set_release_version_latest
85-
if: ${{ env.RELEASE_VERSION == 'master' }}
85+
if: ${{ env.RELEASE_VERSION == 'main' }}
8686
run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
8787

8888
- name: set CPU architecture

‎.github/workflows/submodule_sync.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: submodules-sync
33
on:
44

55
push:
6-
branches: [master]
6+
branches: [main]
77
pull_request:
8-
branches: [master]
8+
branches: [main]
99

1010
release:
1111
types: [published]
@@ -35,7 +35,7 @@ jobs:
3535
- name: Git Sumbodule Update
3636
run: |
3737
git config pull.rebase false
38-
git pull --recurse-submodules origin master
38+
git pull --recurse-submodules origin main
3939
git submodule update --remote --recursive
4040
4141
- name: Commit update

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Introduction
22

3-
This repo has been reinstated. The custom jupyter-hub image is specified in the [CogStack-Nifi](https://github.com/CogStack/CogStack-NiFi/tree/master/services/jupyter-hub) project.
3+
This repo has been reinstated. The custom jupyter-hub image is specified in the [CogStack-Nifi](https://github.com/CogStack/CogStack-NiFi/tree/main/services/jupyter-hub) project.
44

55

66
This repository contains a custom Jupyter Hub Docker image with example notebooks to play with. \
@@ -37,7 +37,7 @@ Full list found in [requirements.txt](./requirements.txt).
3737

3838
## Security
3939

40-
Certificates used are located in the `./security/` folder, taken from the [Cogstack-NiFi](https://github.com/CogStack-NiFi) security folder, [root-ca.key](https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/master/security/root-ca.key) and [root-ca.pem](https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/master/security/root-capem), read the [security section](https://cogstack-nifi.readthedocs.io/en/latest/security.html) for more info on how to generate them from the main NiFi repository.
40+
Certificates used are located in the `./security/` folder, taken from the [Cogstack-NiFi](https://github.com/CogStack-NiFi) security folder, [root-ca.key](https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/root-ca.key) and [root-ca.pem](https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/root-capem), read the [security section](https://cogstack-nifi.readthedocs.io/en/latest/security.html) for more info on how to generate them from the main NiFi repository.
4141

4242
## Setting up your own hub
4343

‎scripts/update_env_cert_from_nifi_repo.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
22

3-
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/master/deploy/general.env > ./env/general.env
4-
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/master/security/root-ca.key > ./security/root-ca.key
5-
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/master/security/root-ca.pem > ./security/root-ca.pem
3+
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/deploy/general.env > ./env/general.env
4+
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/root-ca.key > ./security/root-ca.key
5+
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/root-ca.pem > ./security/root-ca.pem

0 commit comments

Comments
 (0)