diff --git a/linux-anvil-aarch64/Dockerfile b/linux-anvil-aarch64/Dockerfile index d68e7fdf..7ce365fe 100644 --- a/linux-anvil-aarch64/Dockerfile +++ b/linux-anvil-aarch64/Dockerfile @@ -34,21 +34,20 @@ RUN /opt/docker/bin/run_commands # Download and cache new compiler packages. # Should speedup installation of them on CIs. -ENV _channel="c4aarch64" RUN source /opt/conda/etc/profile.d/conda.sh && \ conda activate && \ conda create -n test --yes --quiet --download-only \ - $_channel::binutils_impl_linux-aarch64 \ - $_channel::binutils_linux-aarch64 \ - $_channel::gcc_impl_linux-aarch64 \ - $_channel::gcc_linux-aarch64 \ - $_channel::gfortran_impl_linux-aarch64 \ - $_channel::gfortran_linux-aarch64 \ - $_channel::gxx_impl_linux-aarch64 \ - $_channel::gxx_linux-aarch64 \ - $_channel::libgcc-ng \ - $_channel::libgfortran-ng \ - $_channel::libstdcxx-ng && \ + conda-forge::binutils_impl_linux-aarch64 \ + conda-forge::binutils_linux-aarch64 \ + conda-forge::gcc_impl_linux-aarch64 \ + conda-forge::gcc_linux-aarch64 \ + conda-forge::gfortran_impl_linux-aarch64 \ + conda-forge::gfortran_linux-aarch64 \ + conda-forge::gxx_impl_linux-aarch64 \ + conda-forge::gxx_linux-aarch64 \ + conda-forge::libgcc-ng \ + conda-forge::libgfortran-ng \ + conda-forge::libstdcxx-ng && \ conda remove --yes --quiet -n test --all && \ conda clean -tiy && \ chgrp -R lucky /opt/conda && \ diff --git a/scripts/run_commands b/scripts/run_commands index 2c7c98e4..d0b62754 100755 --- a/scripts/run_commands +++ b/scripts/run_commands @@ -14,10 +14,8 @@ elif [ "$(uname -m)" = "ppc64le" ]; then export conda_chksum="9de38932ed6a8865562e6057b578694f" elif [ "$(uname -m)" = "aarch64" ]; then export supkg="su-exec" - export condapkg="https://github.com/jjhelmus/conda4aarch64/releases/download/1.0.0/c4aarch64_installer-1.0.0-Linux-aarch64.sh" - export conda_chksum="7f6f3c6ac5895188766218f222feb131" - # defaults is not enough - export additional_channel="--add channels c4aarch64" + export condapkg="https://github.com/conda-forge/miniforge/releases/download/4.8.2-1/Miniforge3-4.8.2-1-Linux-aarch64.sh" + export conda_chksum="5cb1651b53052a76d8c2273309578889" elif [ "$(uname -m)" = "armv7l" ]; then export supkg="su-exec" export condapkg="https://github.com/jjhelmus/conda4armv7l/releases/download/1.0.0/conda4armv7l_installer-1.0.0-Linux-armv7l.sh"