Skip to content

Commit 2bfb7ce

Browse files
committed
fix(scancode): Remove broken scancode-license-data call
Scancode utility scancode-license-data has a flaw that inside some environments ignores the path flag. The dependency on distutils, deprecated since Python 3.12+ force install of setuptools to match requirements, but not properly a substitute for distutils. Signed-off-by: Helio Chissini de Castro <[email protected]>
1 parent 0259216 commit 2bfb7ce

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

Dockerfile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,6 @@ RUN pip install --no-cache-dir -U \
184184
# find /opt/scancode-license-data -type f -not -name "*.LICENSE" -exec rm -f {} + \; \
185185
# fi
186186

187-
# # Extract ScanCode license texts to a directory.
188-
# RUN ARCH=$(arch | sed s/aarch64/arm64/) \
189-
# if [ "$ARCH" == "arm64" ]; then \
190-
# echo "Not av ailable for Arm due distutils problem";
191-
# else \
192-
# scancode-license-data --path /opt/scancode-license-data; \
193-
# find /opt/scancode-license-data -type f -not -name "*.LICENSE" -exec rm -f {} + \; \
194-
# fi
195-
196187
RUN mkdir -p $PYTHON_INSTALL_ROOT/conan2 \
197188
&& curl -L https://github.com/conan-io/conan/releases/download/$CONAN2_VERSION/conan-$CONAN2_VERSION-linux-x86_64.tgz | tar -C $PYTHON_INSTALL_ROOT/conan2 -zvx bin \
198189
# Rename the Conan 2 executable to "conan2" to be able to call both Conan version from the package manager.
@@ -201,9 +192,6 @@ RUN mkdir -p $PYTHON_INSTALL_ROOT/conan2 \
201192
FROM scratch AS python
202193
COPY --from=python_install /opt/python /opt/python
203194

204-
FROM scratch AS scancode-license-data
205-
COPY --from=python_install /opt/scancode-license-data /opt/scancode-license-data
206-
207195
#------------------------------------------------------------------------
208196
# NODEJS - Build NodeJS as a separate component with nvm
209197
FROM base AS nodejsbuild
@@ -525,8 +513,6 @@ ENV GEM_HOME=/var/tmp/gem
525513
ENV PATH=$PATH:$RBENV_ROOT/bin:$RBENV_ROOT/shims:$RBENV_ROOT/plugins/ruby-install/bin
526514
COPY --from=ruby --chown=$USER:$USER $RBENV_ROOT $RBENV_ROOT
527515

528-
COPY --from=scancode-license-data --chown=$USER:$USER /opt/scancode-license-data /opt/scancode-license-data
529-
530516
#------------------------------------------------------------------------
531517
# Container with all supported package managers.
532518
FROM minimal-tools AS all-tools

0 commit comments

Comments
 (0)