Skip to content

Commit 7ad1833

Browse files
authored
Merge pull request #44 from Sofie-Automation/chore/trivy-image-name
2 parents bdf86cf + 8ba6040 commit 7ad1833

13 files changed

Lines changed: 54 additions & 53 deletions

File tree

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @nrkno/sofieteam
1+
* @Sofie-Automation/maintainers

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug Report 🐛
22
description: Use this if you've found a bug
3-
title: "Bug Report: [Short description of the bug]"
3+
title: 'Bug Report: [Short description of the bug]'
44
labels:
55
- 🐛bug
66

@@ -9,7 +9,7 @@ body:
99
attributes:
1010
value: |
1111
Before you post, be sure to read our Contribution guidelines:
12-
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
12+
https://sofie-automation.github.io/sofie-core/docs/for-developers/contribution-guidelines
1313
1414
- type: textarea
1515
attributes:

.github/ISSUE_TEMPLATE/other.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Other Issue 🔧
22
description: Use this for other issues
3-
title: "Other: [Short description of the issue]"
3+
title: 'Other: [Short description of the issue]'
44
labels:
55
- Other
66

@@ -9,7 +9,7 @@ body:
99
attributes:
1010
value: |
1111
Before you post, be sure to read our Contribution guidelines:
12-
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
12+
https://sofie-automation.github.io/sofie-core/docs/for-developers/contribution-guidelines
1313
1414
- type: textarea
1515
attributes:

.github/ISSUE_TEMPLATE/question.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Question ❓
22
description: Use this if you have a question to the Sofie team
3-
title: "Question: [Short summary of the question]"
3+
title: 'Question: [Short summary of the question]'
44
labels:
55
- ❓ Question
66

@@ -9,7 +9,7 @@ body:
99
attributes:
1010
value: |
1111
Before you post, be sure to read our Contribution guidelines:
12-
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
12+
https://sofie-automation.github.io/sofie-core/docs/for-developers/contribution-guidelines
1313
1414
- type: textarea
1515
attributes:

.github/ISSUE_TEMPLATE/rfc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Request for Comments ❗
22
description: Use this to initiate a discussion about a new feature or a larger change
3-
title: "RFC: [Short description of the feature/change]"
3+
title: 'RFC: [Short description of the feature/change]'
44
labels:
55
- RFC
66
- Contribution
@@ -10,7 +10,7 @@ body:
1010
attributes:
1111
value: |
1212
Before you post, be sure to read our Contribution guidelines:
13-
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
13+
https://sofie-automation.github.io/sofie-core/docs/for-developers/contribution-guidelines
1414
1515
- type: textarea
1616
attributes:
@@ -23,7 +23,7 @@ body:
2323
- type: textarea
2424
attributes:
2525
label: Use case
26-
description: "Please write some background information here, such as: What is your use case? What problem are you trying to solve?"
26+
description: 'Please write some background information here, such as: What is your use case? What problem are you trying to solve?'
2727
validations:
2828
required: true
2929

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
11
<!--
22
Before you open a PR, be sure to read our Contribution guidelines:
3-
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
3+
https://sofie-automation.github.io/sofie-core/docs/for-developers/contribution-guidelines
44
-->
55

66
## About the Contributor
7+
78
<!--
89
Tell us who / which organization you are representing, and how the Sofie team will be able to contact you.
910
Example: "This pull request is posted on behalf of the NRK."
1011
-->
1112

12-
1313
## Type of Contribution
1414

15-
This is a:
15+
This is a:
16+
1617
<!-- (pick one) -->
17-
Bug fix / Feature / Code improvement / Documentation improvement / Other (please specify)
1818

19+
Bug fix / Feature / Code improvement / Documentation improvement / Other (please specify)
1920

2021
## Current Behavior
22+
2123
<!--
2224
Please describe how things worked before this PR.
2325
If it's a bug fixe: Describe the bug (what was happening?)
2426
-->
2527

26-
2728
## New Behavior
29+
2830
<!--
2931
What is the new behavior?
3032
-->
3133

32-
3334
## Testing Instructions
35+
3436
<!--
3537
Please provide some instructions and other information for how to verify that the feature works.
3638
Examples:
@@ -39,11 +41,12 @@ Examples:
3941
* "This feature also affects 'feature X', so that needs to be tested for regressions as well."
4042
-->
4143

42-
4344
## Other Information
45+
4446
<!-- The more information you can provide, the easier the pull request will be to merge -->
4547

4648
## Status
49+
4750
<!--
4851
Before you open the PR, make sure the items below are done.
4952
If they're not, please open the PR as a Draft.
@@ -52,4 +55,4 @@ If they're not, please open the PR as a Draft.
5255
- [ ] PR is ready to be reviewed.
5356
- [ ] The functionality has been tested by the author.
5457
- [ ] Relevant unit tests has been added / updated.
55-
- [ ] Relevant documentation (code comments, [system documentation](https://nrkno.github.io/sofie-core/)) has been added / updated.
58+
- [ ] Relevant documentation (code comments, [system documentation](https://sofie-automation.github.io/sofie-core/)) has been added / updated.

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ updates:
1111
open-pull-requests-limit: 0
1212
# Default reviewers
1313
reviewers:
14-
- '@nrkno/sofieteam'
14+
- '@Sofie-Automation/maintainers'
1515

1616
- package-ecosystem: 'github-actions'
1717
# Workflow files stored in the
@@ -20,4 +20,4 @@ updates:
2020
schedule:
2121
interval: 'weekly'
2222
reviewers:
23-
- '@nrkno/sofie-ops'
23+
- '@Sofie-Automation/operations'

.github/workflows/build-docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
with:
145145
runs-on: "['ubuntu-latest']"
146146
registry-url: ghcr.io
147-
name: nrkno/sofie-package-manager
147+
name: sofie-automation/sofie-input-gateway
148148
# Don't actually push any images, this is just for trivy scanning for now
149149
push: false
150150
trivy-severity: 'CRITICAL'

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# How to Contribute to this Repository
22

3-
Before contributing to this specific repository, please read the [Contribution Guidelines](https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines) for the Sofie project.
4-
3+
Before contributing to this specific repository, please read the [Contribution Guidelines](https://sofie-automation.github.io/sofie-core/docs/for-developers/contribution-guidelines) for the Sofie project.
54

65
## Branches
6+
77
This repository uses the following branches:
88

9-
* **_master_** is our main branch. We consider it stable and it is used in production.
10-
* The **_develop_** branch is our in-development branch. When a release is ready, we decide to “freeze” that branch and merge it into **_master_** branch.
9+
- **_master_** is our main branch. We consider it stable and it is used in production.
10+
- The **_develop_** branch is our in-development branch. When a release is ready, we decide to “freeze” that branch and merge it into **_master_** branch.
1111

12-
We encourage you to base your contributions on the latest **_develop_** branch. The [_Sofie Releases_](https://nrkno.github.io/sofie-core/releases) page collects the status and timeline of the releases.
12+
We encourage you to base your contributions on the latest **_develop_** branch. The [_Sofie Releases_](https://sofie-automation.github.io/sofie-core/releases) page collects the status and timeline of the releases.

README.md

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
# Sofie Input Gateway
22

3-
This is the _Input Gateway_ of the [**Sofie** TV Automation System](https://github.com/nrkno/Sofie-TV-automation/), used to pipe user input into the [_Sofie Core_](https://github.com/nrkno/sofie-core).
3+
This is the _Input Gateway_ of the [**Sofie** TV Automation System](https://github.com/Sofie-Automation/Sofie-TV-automation/), used to pipe user input into the [_Sofie Core_](https://github.com/Sofie-Automation/sofie-core).
44

55
## General Sofie System Information
6-
* [_Sofie_ Documentation](https://nrkno.github.io/sofie-core/)
7-
* [_Sofie_ Releases](https://nrkno.github.io/sofie-core/releases)
8-
* [Contribution Guidelines](CONTRIBUTING.md)
9-
* [License](LICENSE)
6+
7+
- [_Sofie_ Documentation](https://sofie-automation.github.io/sofie-core/)
8+
- [_Sofie_ Releases](https://sofie-automation.github.io/sofie-core/releases)
9+
- [Contribution Guidelines](CONTRIBUTING.md)
10+
- [License](LICENSE)
1011

1112
---
1213

1314
## Usage
15+
1416
```
1517
// Development:
1618
npm run start -host 127.0.0.1 -port 3000 -log "log.log"
@@ -20,31 +22,27 @@ npm run start
2022

2123
**CLI Arguments:**
2224

23-
| Argument | Description | Environment variable |
24-
| ------------- | ------------- | --- |
25-
| -host | Hostname or IP of Core | CORE_HOST |
26-
| -port | Port of Core | CORE_PORT |
27-
| -log | Path to output log | CORE_LOG |
28-
| -id | Device ID to use | DEVICE_ID |
25+
| Argument | Description | Environment variable |
26+
| -------- | ---------------------- | -------------------- |
27+
| -host | Hostname or IP of Core | CORE_HOST |
28+
| -port | Port of Core | CORE_PORT |
29+
| -log | Path to output log | CORE_LOG |
30+
| -id | Device ID to use | DEVICE_ID |
2931

3032
## Installation for Developers
3133

32-
* yarn
33-
* yarn build
34-
* yarn test
34+
- yarn
35+
- yarn build
36+
- yarn test
3537

3638
### Development Dependencies:
3739

38-
* yarn
39-
https://yarnpkg.com
40+
- yarn
41+
https://yarnpkg.com
4042

41-
* jest
42-
yarn global add jest
43+
- jest
44+
yarn global add jest
4345

4446
---
4547

4648
_The NRK logo is a registered trademark of Norsk rikskringkasting AS. The license does not grant any right to use, in any way, any trademarks, service marks or logos of Norsk rikskringkasting AS._
47-
48-
49-
50-

0 commit comments

Comments
 (0)