diff --git a/.github/workflows/anaconda_debian_ci.yml b/.github/workflows/anaconda_debian_ci.yml index 2c48bf98..aea12611 100644 --- a/.github/workflows/anaconda_debian_ci.yml +++ b/.github/workflows/anaconda_debian_ci.yml @@ -30,7 +30,7 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3 with: - platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm64/v8,linux/s390x - name: Set up Docker Buildx id: buildx @@ -56,7 +56,7 @@ jobs: context: ./anaconda3/debian builder: ${{ steps.buildx.outputs.name }} file: ./anaconda3/debian/Dockerfile - platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm64/v8,linux/s390x tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') }} diff --git a/.github/workflows/anaconda_pkg_build_linux.yml b/.github/workflows/anaconda_pkg_build_linux.yml index d3c417ce..4f1011b3 100644 --- a/.github/workflows/anaconda_pkg_build_linux.yml +++ b/.github/workflows/anaconda_pkg_build_linux.yml @@ -65,7 +65,7 @@ jobs: context: ./anaconda-pkg-build/linux builder: ${{ steps.buildx.outputs.name }} file: ./anaconda-pkg-build/linux/Dockerfile - platforms: linux/amd64,linux/ppc64le,linux/arm64/v8,linux/s390x + platforms: linux/amd64,linux/arm64/v8,linux/s390x build-args: | BASEVERSION=7 tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/anaconda_pkg_build_lts_linux.yml b/.github/workflows/anaconda_pkg_build_lts_linux.yml index 907a40a2..73db3ed2 100644 --- a/.github/workflows/anaconda_pkg_build_lts_linux.yml +++ b/.github/workflows/anaconda_pkg_build_lts_linux.yml @@ -67,7 +67,7 @@ jobs: context: ./anaconda-pkg-build-lts/linux builder: ${{ steps.buildx.outputs.name }} file: ./anaconda-pkg-build-lts/linux/Dockerfile - platforms: linux/amd64,linux/ppc64le,linux/arm64/v8,linux/s390x + platforms: linux/amd64,linux/arm64/v8,linux/s390x build-args: | BASEVERSION=7 tags: ${{ steps.meta.outputs.tags }} diff --git a/anaconda-pkg-base/linux/README.md b/anaconda-pkg-base/linux/README.md index 297eb0f2..9ad58c4f 100644 --- a/anaconda-pkg-base/linux/README.md +++ b/anaconda-pkg-base/linux/README.md @@ -1,4 +1,4 @@ -# Base `Dockerfile`s for testing on linux-{amd64, aarch64, ppc64le, s390x} +# Base `Dockerfile`s for testing on linux-{amd64, aarch64, s390x} Based on [anaconda-pkg-build](https://github.com/ContinuumIO/docker-images/blob/master/anaconda-pkg-build/linux/Dockerfile), but without miniconda3 pre-installed. This allows testing of miniconda3/anaconda3/other installers including testing conda-build. diff --git a/anaconda-pkg-base/linux/defaults.Dockerfile b/anaconda-pkg-base/linux/defaults.Dockerfile index 6cfe04f1..ea4e3f91 100644 --- a/anaconda-pkg-base/linux/defaults.Dockerfile +++ b/anaconda-pkg-base/linux/defaults.Dockerfile @@ -2,8 +2,6 @@ ARG BASEVERSION=7 FROM centos:${BASEVERSION} AS base-amd64 -FROM centos:${BASEVERSION} AS base-ppc64le - FROM amazonlinux:2 AS base-arm64 FROM clefos:${BASEVERSION} AS base-s390x diff --git a/anaconda-pkg-build/linux/Dockerfile b/anaconda-pkg-build/linux/Dockerfile index 09e772a4..e4f2e64d 100644 --- a/anaconda-pkg-build/linux/Dockerfile +++ b/anaconda-pkg-build/linux/Dockerfile @@ -6,8 +6,6 @@ ARG GCC_VER=11.2.0 FROM centos:${BASEVERSION} AS base-amd64 -FROM centos:${BASEVERSION} AS base-ppc64le - FROM amazonlinux:2 AS base-arm64 FROM clefos:${BASEVERSION} AS base-s390x diff --git a/anaconda3/amazonlinux/Dockerfile b/anaconda3/amazonlinux/Dockerfile index 68745aa9..70e36a33 100644 --- a/anaconda3/amazonlinux/Dockerfile +++ b/anaconda3/amazonlinux/Dockerfile @@ -25,7 +25,7 @@ RUN yum install -y \ subversion && \ yum clean all && \ rm -rf /var/cache/yum && \ - wget --quiet https://repo.anaconda.com/archive/Anaconda3-2023.09-0-Linux-aarch64.sh -O ~/anaconda.sh && \ + wget --quiet https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-aarch64.sh -O ~/anaconda.sh && \ /bin/bash ~/anaconda.sh -b -p /opt/conda && \ rm ~/anaconda.sh && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ diff --git a/anaconda3/debian/Dockerfile b/anaconda3/debian/Dockerfile index 3ddc7200..7823c548 100644 --- a/anaconda3/debian/Dockerfile +++ b/anaconda3/debian/Dockerfile @@ -30,17 +30,14 @@ RUN set -x && \ && rm -rf /var/lib/apt/lists/* && \ UNAME_M="$(uname -m)" && \ if [ "${UNAME_M}" = "x86_64" ]; then \ - ANACONDA_URL="https://repo.anaconda.com/archive/Anaconda3-2023.09-0-Linux-x86_64.sh"; \ - SHA256SUM="6c8a4abb36fbb711dc055b7049a23bbfd61d356de9468b41c5140f8a11abd851"; \ + ANACONDA_URL="https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-x86_64.sh"; \ + SHA256SUM="c536ddb7b4ba738bddbd4e581b29308cb332fa12ae3fa2cd66814bd735dff231"; \ elif [ "${UNAME_M}" = "s390x" ]; then \ - ANACONDA_URL="https://repo.anaconda.com/archive/Anaconda3-2023.09-0-Linux-s390x.sh"; \ - SHA256SUM="ee817071a2ad94e044fb48061a721bc86606b2f4906b705e4f42177eeb3ca7c5"; \ + ANACONDA_URL="https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-s390x.sh"; \ + SHA256SUM="3e2e8b17ea9a5caafd448f52e01435998b2e1ce102040a924d5bd6e05a1d735b"; \ elif [ "${UNAME_M}" = "aarch64" ]; then \ - ANACONDA_URL="https://repo.anaconda.com/archive/Anaconda3-2023.09-0-Linux-aarch64.sh"; \ - SHA256SUM="69ee26361c1ec974199bce5c0369e3e9a71541de7979d2b9cfa4af556d1ae0ea"; \ - elif [ "${UNAME_M}" = "ppc64le" ]; then \ - ANACONDA_URL="https://repo.anaconda.com/archive/Anaconda3-2023.09-0-Linux-ppc64le.sh"; \ - SHA256SUM="5ea1ed9808af95eb2655fe6a4ffdb66bea66ecd1d053fc2ee69eacc7685ef665"; \ + ANACONDA_URL="https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-aarch64.sh"; \ + SHA256SUM="28c5bed6fba84f418516e41640c7937514aabd55e929a8f66937c737303c7bba"; \ fi && \ wget "${ANACONDA_URL}" -O anaconda.sh -q && \ echo "${SHA256SUM} anaconda.sh" > shasum && \