From 3ce778278c5492eff2cf587bac38cf79bc654714 Mon Sep 17 00:00:00 2001 From: Daniel Bast <2790401+dbast@users.noreply.github.com> Date: Tue, 28 Mar 2023 15:22:27 +0200 Subject: [PATCH] Move config reset _before_ all `conda config --set` calls --- anaconda-pkg-build/linux/Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/anaconda-pkg-build/linux/Dockerfile b/anaconda-pkg-build/linux/Dockerfile index c310ee6a..04be033e 100644 --- a/anaconda-pkg-build/linux/Dockerfile +++ b/anaconda-pkg-build/linux/Dockerfile @@ -102,6 +102,10 @@ RUN MC_ARCH="$(uname -m)" \ && /opt/conda/bin/conda update --all --quiet --yes \ && /opt/conda/bin/conda install --quiet --yes conda-build conda-libmamba-solver \ && /opt/conda/bin/conda clean --all --yes \ + && rm -fv /opt/conda/.condarc \ + && /opt/conda/bin/conda config --system --set show_channel_urls True \ + && /opt/conda/bin/conda config --system --set add_pip_as_python_dependency False \ + && /opt/conda/bin/conda config --show-sources \ # The solver has to be set right after the `conda clean` call and before the next # `conda install` call to avoid incompatible cache formats. && /opt/conda/bin/conda config --system --set solver libmamba \ @@ -118,12 +122,6 @@ RUN MC_ARCH="$(uname -m)" \ && /opt/conda/bin/conda install --download-only --quiet --yes \ "gcc_linux-$subdir=${GCC_VER}" "gxx_linux-$subdir=${GCC_VER}" -# hadolint ignore=DL3059 -RUN rm -fv /opt/conda/.condarc \ - && /opt/conda/bin/conda config --system --set show_channel_urls True \ - && /opt/conda/bin/conda config --system --set add_pip_as_python_dependency False \ - && /opt/conda/bin/conda config --show-sources - ENV PATH="/opt/conda/bin:${PATH}" CMD [ "/bin/bash" ]