Skip to content

Commit a5553ad

Browse files
committed
Use the subcommand scancode-reindex-licenses
As reindexing licenses is an exceptional operation, a separate script is not preferable. Hence, the script has been removed. In the earlier Dockerfile, `./scancode --reindex-licenses` did two jobs: 1. The initial configuration 2. Reindexing of licenses In the new Dockerfile, `./configure` is first run to configure the venv. This is followed by a run of `scancode-reindex-licenses`. Signed-off-by: Abhishek Kumar <abhi.kr.2100@gmail.com>
1 parent 257dd66 commit a5553ad

File tree

2 files changed

+18
-156
lines changed

2 files changed

+18
-156
lines changed

Dockerfile

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,31 @@ ENV PYTHONDONTWRITEBYTECODE 1
1717
# OS requirements as per
1818
# https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html
1919
RUN apt-get update \
20-
&& apt-get install -y --no-install-recommends \
21-
bzip2 \
22-
xz-utils \
23-
zlib1g \
24-
libxml2-dev \
25-
libxslt1-dev \
26-
libgomp1 \
27-
libsqlite3-0 \
28-
libgcrypt20 \
29-
libpopt0 \
30-
libzstd1 \
31-
&& apt-get clean \
32-
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
20+
&& apt-get install -y --no-install-recommends \
21+
bzip2 \
22+
xz-utils \
23+
zlib1g \
24+
libxml2-dev \
25+
libxslt1-dev \
26+
libgomp1 \
27+
libsqlite3-0 \
28+
libgcrypt20 \
29+
libpopt0 \
30+
libzstd1 \
31+
&& apt-get clean \
32+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
3333

3434
# Create directory for scancode sources
3535
WORKDIR /scancode-toolkit
3636

3737
# Copy sources into docker container
3838
COPY . /scancode-toolkit
3939

40-
# Run scancode-reindex-licenses once for initial configuration and to create
41-
# the base license index
42-
RUN ./scancode-reindex-licenses
40+
# Initial configuration
41+
RUN ./configure
42+
43+
# Run scancode-reindex-licenses to build the base license index
44+
RUN ./venv/bin/scancode-reindex-licenses
4345

4446
# Add scancode to path
4547
ENV PATH=/scancode-toolkit:$PATH

scancode-reindex-licenses

Lines changed: 0 additions & 140 deletions
This file was deleted.

0 commit comments

Comments
 (0)