diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0167686..79dc8cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ jobs: fail-fast: false matrix: include: - - IDP_CONF: intelpython3_core - IDP_CONF: intelpython3_full steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3ac45e9..86c8a1f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,26 +22,12 @@ jobs: username: ${{ secrets.DOCKER_LOGIN_USERNAME }} password: ${{ secrets.DOCKER_LOGIN_PASSWORD }} - - name: Extract intelpython3_core metadata (tags, labels) for Docker - id: meta_core - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: intelpython/intelpython3_core - - name: Extract intelpython3_full metadata (tags, labels) for Docker id: meta_full uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 with: images: intelpython/intelpython3_full - - name: Build and push Docker image for intelpython3_core - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - with: - context: configs/intelpython3_core - push: true - tags: ${{ steps.meta_core.outputs.tags }} - labels: ${{ steps.meta_core.outputs.labels }} - - name: Build and push Docker image for intelpython3_full uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: diff --git a/configs/intelpython3_core/Dockerfile b/configs/intelpython3_core/Dockerfile deleted file mode 100644 index b3de45d..0000000 --- a/configs/intelpython3_core/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2023, Intel Corporation -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of Intel Corporation nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -FROM continuumio/miniconda3 - - -RUN conda config --add channels intel -RUN conda install -y -q intelpython3_core=2023.1 -RUN conda clean --all diff --git a/configs/intelpython3_core/README.md b/configs/intelpython3_core/README.md deleted file mode 100644 index ddb2b6e..0000000 --- a/configs/intelpython3_core/README.md +++ /dev/null @@ -1,35 +0,0 @@ -Docker images for [Intel Distribution for Python](https://www.intel.com/content/www/us/en/developer/tools/oneapi/distribution-for-python.html) - -The image defaults to starting with a bash shell. Intel Python is on the path. There is 1 image for every install configuration. - -Images: - -* intelpython3_core -* intelpython3_full - -You usually want the 'latest' tag, but the docker image tag can be used to request a specific package. For example: - - docker pull intelpython3_core:2017.0.3-1 - -Will get an image that uses the conda package: intelpython3_core-2017.0.3-1 - -Tags: - -* 2020.0 -* 2019.5 -* 2019.4 -* 2019.3 -* 2019.1-0 -* 2019.0.0-0b, 2019.0.0-0a, 2019.0.0-0, 2019.0.0 -* 2018.0.3 -* 2018.0.2 -* 2018.0.1-0, 2018.0.1 -* 2018.0.0-0, 2018.0.0 -* 2017.0.3-3, 2017.0.3 -* 2017.0.3-1 -* 2017.0.3-0 -* 2017.0.2-0, 2017.0.2 -* 2017.0.1-1, 2017.0.1 -* 2017.0.0-2, 2017.0.0 - -LEGAL NOTICE: By accessing, downloading or using this software and any required dependent software (the "Software Package"), you agree to the terms and conditions of the software license agreements for the Software Package, which may also include notices, disclaimers, or license terms for third party software included with the Software Package. Please refer to the "third-party-programs.txt" or other similarly-named text file for additional details. diff --git a/configs/intelpython3_core/docker-compose.test.yml b/configs/intelpython3_core/docker-compose.test.yml deleted file mode 100644 index 0883fed..0000000 --- a/configs/intelpython3_core/docker-compose.test.yml +++ /dev/null @@ -1,3 +0,0 @@ -sut: - build: . - command: python -c "import scipy" \ No newline at end of file diff --git a/configs/intelpython3_core/hooks/post_push b/configs/intelpython3_core/hooks/post_push deleted file mode 100644 index 365a61f..0000000 --- a/configs/intelpython3_core/hooks/post_push +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/bash - -docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2021.4 -docker push $DOCKER_REPO:2021.4 - -docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest -docker push $DOCKER_REPO:latest \ No newline at end of file diff --git a/configs/intelpython3_full/Dockerfile b/configs/intelpython3_full/Dockerfile index 75db6e0..bbaf93a 100644 --- a/configs/intelpython3_full/Dockerfile +++ b/configs/intelpython3_full/Dockerfile @@ -23,9 +23,9 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM continuumio/miniconda3 +FROM condaforge/mambaforge - -RUN conda config --add channels intel -RUN conda install -y -q intelpython3_full=2023.1 +RUN conda config --add channels https://software.repos.intel.com/python/conda +RUN conda config --add channels conda-forge +RUN conda install -y -q intelpython3_full=2025.0 python=3.12 RUN conda clean --all diff --git a/configs/intelpython3_full/README.md b/configs/intelpython3_full/README.md index ddb2b6e..5fa7e12 100644 --- a/configs/intelpython3_full/README.md +++ b/configs/intelpython3_full/README.md @@ -4,14 +4,13 @@ The image defaults to starting with a bash shell. Intel Python is on the path. T Images: -* intelpython3_core * intelpython3_full You usually want the 'latest' tag, but the docker image tag can be used to request a specific package. For example: - docker pull intelpython3_core:2017.0.3-1 + docker pull intelpython3_full:2017.0.3-1 -Will get an image that uses the conda package: intelpython3_core-2017.0.3-1 +Will get an image that uses the conda package: intelpython3_full-2017.0.3-1 Tags: diff --git a/tpls/tpl.README.md b/tpls/tpl.README.md index ddb2b6e..5fa7e12 100644 --- a/tpls/tpl.README.md +++ b/tpls/tpl.README.md @@ -4,14 +4,13 @@ The image defaults to starting with a bash shell. Intel Python is on the path. T Images: -* intelpython3_core * intelpython3_full You usually want the 'latest' tag, but the docker image tag can be used to request a specific package. For example: - docker pull intelpython3_core:2017.0.3-1 + docker pull intelpython3_full:2017.0.3-1 -Will get an image that uses the conda package: intelpython3_core-2017.0.3-1 +Will get an image that uses the conda package: intelpython3_full-2017.0.3-1 Tags: