Skip to content

Commit 30288b1

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 392d2a9 commit 30288b1

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
@@ -174,15 +174,6 @@ RUN pip install --no-cache-dir -U \
174174
python-inspector=="$PYTHON_INSPECTOR_VERSION" \
175175
setuptools=="$PYTHON_SETUPTOOLS_VERSION"
176176

177-
# # Extract ScanCode license texts to a directory.
178-
# RUN ARCH=$(arch | sed s/aarch64/arm64/) \
179-
# if [ "$ARCH" == "arm64" ]; then \
180-
# echo "Not av ailable for Arm due distutils problem";
181-
# else \
182-
# scancode-license-data --path /opt/scancode-license-data; \
183-
# find /opt/scancode-license-data -type f -not -name "*.LICENSE" -exec rm -f {} + \; \
184-
# fi
185-
186177
RUN mkdir -p $PYTHON_INSTALL_ROOT/conan2 \
187178
&& 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 \
188179
# Rename the Conan 2 executable to "conan2" to be able to call both Conan version from the package manager.
@@ -191,9 +182,6 @@ RUN mkdir -p $PYTHON_INSTALL_ROOT/conan2 \
191182
FROM scratch AS python
192183
COPY --from=python_install /opt/python /opt/python
193184

194-
FROM scratch AS scancode-license-data
195-
COPY --from=python_install /opt/scancode-license-data /opt/scancode-license-data
196-
197185
#------------------------------------------------------------------------
198186
# NODEJS - Build NodeJS as a separate component with nvm
199187
FROM base AS nodejsbuild
@@ -514,8 +502,6 @@ ENV GEM_HOME=/var/tmp/gem
514502
ENV PATH=$PATH:$RBENV_ROOT/bin:$RBENV_ROOT/shims:$RBENV_ROOT/plugins/ruby-install/bin
515503
COPY --from=ruby --chown=$USER:$USER $RBENV_ROOT $RBENV_ROOT
516504

517-
COPY --from=scancode-license-data --chown=$USER:$USER /opt/scancode-license-data /opt/scancode-license-data
518-
519505
#------------------------------------------------------------------------
520506
# Container with all supported package managers.
521507
FROM minimal-tools AS all-tools

0 commit comments

Comments
 (0)