Skip to content

Fix issue 3155 by running scancode-reindex-licenses subcommand instead of using --reindex-licenses flag #3159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 24, 2022
Merged

Fix issue 3155 by running scancode-reindex-licenses subcommand instead of using --reindex-licenses flag #3159

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ec13a2
Add `scancode-reindex-licenses` script
abhi-kr-2100 Nov 23, 2022
257dd66
Use `scancode-reindex-licenses` to generate index
abhi-kr-2100 Nov 23, 2022
a5553ad
Use the subcommand `scancode-reindex-licenses`
abhi-kr-2100 Nov 23, 2022
1595e19
Remove extra edits caused by autoformatting
abhi-kr-2100 Nov 23, 2022
442daf9
Add CI test for building and scanning using Docker
abhi-kr-2100 Nov 23, 2022
dd0b4f0
Combine configuration and reindexing into one RUN instruction
abhi-kr-2100 Nov 23, 2022
2b9d552
Add CI job to test build and run with Docker
abhi-kr-2100 Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ WORKDIR /scancode-toolkit
# Copy sources into docker container
COPY . /scancode-toolkit

# Run scancode once for initial configuration, with
# --reindex-licenses to create the base license index
RUN ./scancode --reindex-licenses
# Initial configuration
RUN ./configure

# Run scancode-reindex-licenses to build the base license index
RUN ./venv/bin/scancode-reindex-licenses

# Add scancode to path
ENV PATH=/scancode-toolkit:$PATH
Expand Down
21 changes: 21 additions & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,27 @@

jobs:


################################################################################
# Tests building with docker
################################################################################


- job: test_build_and_scan_with_docker
steps:
- task: Docker@2
displayName: Check that building using Docker succeeds
inputs:
command: 'build'
Dockerfile: '**/Dockerfile'
tags: |
'scancode-toolkit'
'scancode-toolkit:$(Build.BuildId)'
- script: |
docker scan scancode-toolkit:$(Build.BuildId)
displayName: 'Scan image'


################################################################################
# These jobs are using VMs and Azure-provided Pythons 3.8
################################################################################
Expand Down