Skip to content

Commit 42cb443

Browse files
committed
Update Dockerfile #3967
* Use setup-mini.cfg in Dockerfile * Install proper runtime libraries * Install build_essential to build some wheels, then remove it Signed-off-by: Jono Yang <[email protected]>
1 parent 0df1b8e commit 42cb443

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

Dockerfile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,32 @@ RUN apt-get update \
3030
libgcrypt20 \
3131
libpopt0 \
3232
libzstd1 \
33-
libarchive-dev \
34-
libmagic-dev \
33+
libarchive13 \
34+
libmagic1 \
35+
libmagic-mgc \
3536
7zip \
36-
&& apt-get clean \
37-
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
37+
build-essential
3838

3939
# Create directory for scancode sources
4040
WORKDIR /scancode-toolkit
4141

4242
# Copy sources into docker container
4343
COPY . /scancode-toolkit
4444

45+
# Use setup-mini.cfg to avoid installing typecode[full] and extractcode[full]
46+
COPY setup-mini.cfg setup.cfg
47+
4548
# Initial configuration using ./configure, scancode-reindex-licenses to build
4649
# the base license index
4750
RUN ./configure \
4851
&& ./venv/bin/scancode-reindex-licenses
4952

53+
# Remove unnecessary packages
54+
RUN apt-get purge -y build-essential \
55+
&& apt-get autoremove --purge -y \
56+
&& apt-get clean \
57+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
58+
5059
# Add scancode to path
5160
ENV PATH=/scancode-toolkit:$PATH
5261

setup-mini.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ packages =
153153

154154
# use 7zip, libarchive, and libmagic provided on the system
155155
system_provided =
156-
extractcode-7z-system-provided >= 33.0.0
156+
extractcode-7z-system-provided >= 33.0.1
157157
extractcode-libarchive-system-provided >= 33.0.0
158158
typecode-libmagic-system-provided >= 33.0.0
159159

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ packages =
153153

154154
# use 7zip, libarchive, and libmagic provided on the system
155155
system_provided =
156-
extractcode-7z-system-provided >= 33.0.0
156+
extractcode-7z-system-provided >= 33.0.1
157157
extractcode-libarchive-system-provided >= 33.0.0
158158
typecode-libmagic-system-provided >= 33.0.0
159159

0 commit comments

Comments
 (0)