Skip to content

Commit 76d7657

Browse files
agustingrohagustingroh
authored
Chore/groh/replace scanoss py image by scanoss jenkins Docker image
* chore:ES-88 Replaces default scanoss-py image by scanoss-py-jenkins Docker image * chore:ES-89 Upgrades scanoss-py Docker image documentation
1 parent 33d0d18 commit 76d7657

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

‎README.md

+20-20
Original file line numberDiff line numberDiff line change
@@ -76,26 +76,26 @@ Use the same example pipeline, set the following ids:
7676

7777
The following parameters are available in the example pipeline.
7878

79-
| Parameter | Description | Default | Type |
80-
|----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------|----------|
81-
| SCANOSS_CLI_DOCKER_IMAGE | SCANOSS CLI Docker Image. | [https://ghcr.io/scanoss/scanoss-py-base:v1.19.4](https://github.com/scanoss/scanoss.py/pkgs/container/scanoss-py) | Pipeline |
82-
| ABORT_ON_POLICY_FAILURE | Abort pipeline on pipeline failure. | `false` | Pipeline |
83-
| SCANOSS_API_URL | SCANOSS API endpoint. | https://api.osskb.org/scan/direct | Pipeline |
84-
| SCANOSS_API_TOKEN_ID | SCANOSS API Token ID. | scanoss-token | Pipeline |
85-
| SKIP_SNIPPET | Skip the generation of snippets. | `false` | Pipeline |
86-
| SCANOSS_SETTINGS | Settings file to use for scanning. See the SCANOSS settings [documentation](https://scanoss.readthedocs.io/projects/scanoss-py/en/latest/#settings-file) | `true` | Pipeline |
87-
| SETTINGS_FILE_PATH | SCANOSS settings file path. | scanoss.json | Pipeline |
88-
| DEPENDENCY_ENABLED | Scan dependencies (optional - default false). | `false` | Pipeline |
89-
| DEPENDENCY_SCOPE | Gets development or production dependencies (scopes: 'prod' - 'dev'). | '' | Pipeline |
90-
| DEPENDENCY_SCOPE_INCLUDE | Custom list of dependency scopes to be included. Provide scopes as a comma-separated list. | '' | Pipeline |
91-
| DEPENDENCY_SCOPE_EXCLUDE | Custom list of dependency scopes to be EXCLUDED. Provide scopes as a comma-separated list. | '' | Pipeline |
92-
| LICENSES_COPYLEFT_INCLUDE | List of Copyleft licenses to append to the default list. Provide licenses as a comma-separated list. | '' | Pipeline |
93-
| LICENSES_COPYLEFT_EXCLUDE | List of Copyleft licenses to remove from default list. Provide licenses as a comma-separated list. | '' | Pipeline |
94-
| LICENSES_COPYLEFT_EXPLICIT | Explicit list of Copyleft licenses to consider. Provide licenses as a comma-separated list. | '' | Pipeline |
95-
| CREATE_JIRA_ISSUE | Enables JIRA reporting | `false` | Pipeline |
96-
| JIRA_URL | JIRA URL | '' | Pipeline |
97-
| JIRA_PROJECT_KEY | JIRA Project Key | '' | Pipeline |
98-
| JIRA_CREDENTIALS | JIRA credentials ID | jira-credentials | Pipeline |
79+
| Parameter | Description | Default | Type |
80+
|----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
81+
| SCANOSS_CLI_DOCKER_IMAGE | SCANOSS CLI Docker Image. | [https://ghcr.io/scanoss/scanoss-py-jenkins:v1.19.5](https://github.com/scanoss/scanoss.py/pkgs/container/scanoss-py-jenkins/337045183?tag=v1.19.5) | Pipeline |
82+
| ABORT_ON_POLICY_FAILURE | Abort pipeline on pipeline failure. | `false` | Pipeline |
83+
| SCANOSS_API_URL | SCANOSS API endpoint. | https://api.osskb.org/scan/direct | Pipeline |
84+
| SCANOSS_API_TOKEN_ID | SCANOSS API Token ID. | scanoss-token | Pipeline |
85+
| SKIP_SNIPPET | Skip the generation of snippets. | `false` | Pipeline |
86+
| SCANOSS_SETTINGS | Settings file to use for scanning. See the SCANOSS settings [documentation](https://scanoss.readthedocs.io/projects/scanoss-py/en/latest/#settings-file) | `true` | Pipeline |
87+
| SETTINGS_FILE_PATH | SCANOSS settings file path. | scanoss.json | Pipeline |
88+
| DEPENDENCY_ENABLED | Scan dependencies (optional - default false). | `false` | Pipeline |
89+
| DEPENDENCY_SCOPE | Gets development or production dependencies (scopes: 'prod' - 'dev'). | '' | Pipeline |
90+
| DEPENDENCY_SCOPE_INCLUDE | Custom list of dependency scopes to be included. Provide scopes as a comma-separated list. | '' | Pipeline |
91+
| DEPENDENCY_SCOPE_EXCLUDE | Custom list of dependency scopes to be EXCLUDED. Provide scopes as a comma-separated list. | '' | Pipeline |
92+
| LICENSES_COPYLEFT_INCLUDE | List of Copyleft licenses to append to the default list. Provide licenses as a comma-separated list. | '' | Pipeline |
93+
| LICENSES_COPYLEFT_EXCLUDE | List of Copyleft licenses to remove from default list. Provide licenses as a comma-separated list. | '' | Pipeline |
94+
| LICENSES_COPYLEFT_EXPLICIT | Explicit list of Copyleft licenses to consider. Provide licenses as a comma-separated list. | '' | Pipeline |
95+
| CREATE_JIRA_ISSUE | Enables JIRA reporting | `false` | Pipeline |
96+
| JIRA_URL | JIRA URL | '' | Pipeline |
97+
| JIRA_PROJECT_KEY | JIRA Project Key | '' | Pipeline |
98+
| JIRA_CREDENTIALS | JIRA credentials ID | jira-credentials | Pipeline |
9999

100100

101101
## Setting Up GitHub Webhook Trigger

‎SCANOSS-Jenkins-pipeline

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pipeline {
44
parameters {
55

66
string(name: 'SCANOSS_API_TOKEN_ID', defaultValue:"scanoss-token", description: 'The reference ID for the SCANOSS API TOKEN credential')
7-
string(name: 'SCANOSS_CLI_DOCKER_IMAGE', defaultValue:"ghcr.io/scanoss/scanoss-py-base:v1.19.4", description: 'SCANOSS CLI Docker Image')
7+
string(name: 'SCANOSS_CLI_DOCKER_IMAGE', defaultValue:"ghcr.io/scanoss/scanoss-py-jenkins:v1.19.5", description: 'SCANOSS CLI Docker Image')
88
string(name: 'SCANOSS_API_URL', defaultValue:"https://api.osskb.org/scan/direct", description: 'SCANOSS API URL (optional - default: https://api.osskb.org/scan/direct)')
99

1010

@@ -49,7 +49,6 @@ pipeline {
4949
agent {
5050
docker {
5151
image params.SCANOSS_CLI_DOCKER_IMAGE
52-
args '-u root'
5352
// Run the container on the node specified at the
5453
// top-level of the Pipeline, in the same workspace,
5554
// rather than on a new node entirely:

0 commit comments

Comments
 (0)