diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index e6114264..1af25dff 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -14,7 +14,7 @@ on: jobs: build: - runs-on: ubuntu-20.04-8c-32g-300h + runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-8c-32g-300h') || 'ubuntu-latest' }} env: DOCKER_CLI_EXPERIMENTAL: enabled DOCKER_BUILDKIT: '1' diff --git a/.github/workflows/python-sonar.yml b/.github/workflows/python-sonar.yml index 0c0e396a..58c6faca 100644 --- a/.github/workflows/python-sonar.yml +++ b/.github/workflows/python-sonar.yml @@ -3,7 +3,7 @@ name: Test Python aswfdocker Library - Sonar on: push: branches: - - master + - main jobs: sonar: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ae8f224..836a5dfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -765,7 +765,7 @@ tbb/latest@aswf/vfx2021 ### Changed -* Next image releases will contain newer [OCI Annotations](https://github.com/opencontainers/image-spec/blob/master/annotations.md) +* Next image releases will contain newer [OCI Annotations](https://github.com/opencontainers/image-spec/blob/main/annotations.md) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 44ebc1bf..6cca7055 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,7 +75,7 @@ Every commit must be signed off. That is, every commit log message must include a “`Signed-off-by`” line (generated, for example, with “`git commit --signoff`”), indicating that the committer wrote the code and has the right to release it under the [Apache-2.0](LICENSE.md) -license. See [Contribution Sign-Off](https://github.com/AcademySoftwareFoundation/tac/blob/master/process/contributing.md#contribution-sign-off) +license. See [Contribution Sign-Off](https://github.com/AcademySoftwareFoundation/tac/blob/main/process/contributing.md#contribution-sign-off) for more information on this requirement. ## Development Workflow @@ -106,21 +106,21 @@ Please read the Python [README.md](python/README.md) file for further instructio The aswf-docker repository uses a simple branching and merging strategy. -All development work is done directly on the master branch. The master +All development work is done directly on the main branch. The main branch represents the bleeding-edge of the project and most contributions should be done on top of it. -After sufficient work is done on the master branch and the aswf-docker +After sufficient work is done on the main branch and the aswf-docker leadership determines that a release is due, we will bump the relevant internal versioning and tag a commit with the corresponding version number, e.g. v2.0.1. Each Minor version also has its own “Release Branch”, e.g. RB-1.1. This marks a branch of code dedicated to that Major.Minor version, which allows upstream bug fixes to be -cherry-picked to a given version while still allowing the master +cherry-picked to a given version while still allowing the main branch to continue forward onto higher versions. This basic repository structure keeps maintenance low, while remaining simple to understand. -To reiterate, the master branch represents the latest development +To reiterate, the main branch represents the latest development version, so beware that it may include untested features and is not generally stable enough for release. To retrieve a stable version of the source code, use one of the release branches. @@ -181,7 +181,7 @@ the work. 6. Upon receiving the required number of Committer approvals (as outlined in [Required Approvals](#required-approvals)), a Committer -other than the PR contributor may merge changes into the master +other than the PR contributor may merge changes into the main branch. ### Code Review and Required Approvals @@ -354,7 +354,7 @@ E.g. to build and push a new `ninja` package these commands can be run to push t # push to aswftesting aswfdocker --verbose --repo-uri https://github.com/AcademySoftwareFoundation/aswf-docker --source-branch refs/heads/testing build -t PACKAGE --group common --version 1 --target ninja --push YES # push to aswf -aswfdocker --verbose --repo-uri https://github.com/AcademySoftwareFoundation/aswf-docker --source-branch refs/heads/master build -t PACKAGE --group common --version 1 --target ninja --push YES +aswfdocker --verbose --repo-uri https://github.com/AcademySoftwareFoundation/aswf-docker --source-branch refs/heads/main build -t PACKAGE --group common --version 1 --target ninja --push YES ``` ### Manual GitHub release creation @@ -437,7 +437,7 @@ aswfdocker release -t PACKAGE -g base2 -v 2018 -v 2019 -v 2020 -v 2021 -v 2022 - # Wait for Qt builds to finish (2-6 hours!) # Usually some Qt build will fail as too big and too slow for free GitHub actions... So here's how to build qt locally: -aswfdocker --repo-uri https://github.com/AcademySoftwareFoundation/aswf-docker --source-branch refs/heads/master --verbose build -n aswf/ci-package-qt:2024 +aswfdocker --repo-uri https://github.com/AcademySoftwareFoundation/aswf-docker --source-branch refs/heads/main --verbose build -n aswf/ci-package-qt:2024 docker push aswf/ci-package-qt:2024 docker push aswf/ci-package-qt:2024-6.5.3 docker push aswf/ci-package-qt:preview diff --git a/README.md b/README.md index 0ebb1e6d..2f9b4be7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Docker Images for the Academy Software Foundation -[![License](https://img.shields.io/github/license/AcademySoftwareFoundation/aswf-docker)](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/LICENSE) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) +[![License](https://img.shields.io/github/license/AcademySoftwareFoundation/aswf-docker)](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/LICENSE) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=AcademySoftwareFoundation_aswf-docker&metric=coverage)](https://sonarcloud.io/dashboard?id=AcademySoftwareFoundation_aswf-docker) [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=AcademySoftwareFoundation_aswf-docker&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=AcademySoftwareFoundation_aswf-docker) [![Test Build Docker Images](https://github.com/AcademySoftwareFoundation/aswf-docker/workflows/Test%20Build%20Docker%20Images/badge.svg)](https://github.com/AcademySoftwareFoundation/aswf-docker/actions?query=workflow%3A%22Test+Build+Docker+Images%22) [![Test Python aswfdocker Library](https://github.com/AcademySoftwareFoundation/aswf-docker/workflows/Test%20Python%20aswfdocker%20Library/badge.svg)](https://github.com/AcademySoftwareFoundation/aswf-docker/actions?query=workflow%3A%22Test+Python+aswfdocker+Library%22) diff --git a/ci-base/Dockerfile b/ci-base/Dockerfile index cf0df2fd..dfa7f440 100644 --- a/ci-base/Dockerfile +++ b/ci-base/Dockerfile @@ -67,7 +67,7 @@ LABEL org.opencontainers.image.name="$ASWF_ORG/ci-base" LABEL org.opencontainers.image.title="Base CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, TBB, Boost and other base libraries" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-base/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-base/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-base/README.md b/ci-base/README.md index f2b3ffa2..e0f9a6f2 100644 --- a/ci-base/README.md +++ b/ci-base/README.md @@ -15,7 +15,7 @@ for further information, and participate in the discussion on the Contains: Python, TBB, Boost and other base libraries -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-base/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-base/Dockerfile) ## [aswf/ci-base:2019.9](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2019.9) diff --git a/ci-baseqt/Dockerfile b/ci-baseqt/Dockerfile index 51603dcc..9c0b3059 100644 --- a/ci-baseqt/Dockerfile +++ b/ci-baseqt/Dockerfile @@ -71,7 +71,7 @@ LABEL org.opencontainers.image.name="$ASWF_ORG/ci-baseqt" LABEL org.opencontainers.image.title="Base with Qt and PySide CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, TBB, Boost, Qt, PySide and other base libraries" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-baseqt/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-baseqt/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-baseqt/README.md b/ci-baseqt/README.md index baaccdc9..a605fbd5 100644 --- a/ci-baseqt/README.md +++ b/ci-baseqt/README.md @@ -15,7 +15,7 @@ for further information, and participate in the discussion on the Contains: Python, TBB, Boost, Qt, PySide and other base libraries -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-baseqt/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-baseqt/Dockerfile) ## [aswf/ci-baseqt:2019.2](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2019.2) diff --git a/ci-common/Dockerfile b/ci-common/Dockerfile index cd7c8f03..e3816a6e 100644 --- a/ci-common/Dockerfile +++ b/ci-common/Dockerfile @@ -60,7 +60,7 @@ LABEL org.opencontainers.image.name="$ASWF_ORG/ci-common" LABEL org.opencontainers.image.title="Common CI Docker Image" LABEL org.opencontainers.image.description="Contains: GCC, Clang, CMake, Jinja, ccache and all base OS libraries" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-common/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-common/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-common/README.md b/ci-common/README.md index 69f7e856..1f6d1707 100644 --- a/ci-common/README.md +++ b/ci-common/README.md @@ -15,7 +15,7 @@ for further information, and participate in the discussion on the Contains: GCC, Clang, CMake, Jinja, ccache and all base OS libraries -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-common/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-common/Dockerfile) ## [aswf/ci-common:1-clang6.8](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang6.8) diff --git a/ci-materialx/Dockerfile b/ci-materialx/Dockerfile index a39fc4c3..49c27a4f 100644 --- a/ci-materialx/Dockerfile +++ b/ci-materialx/Dockerfile @@ -50,7 +50,7 @@ LABEL org.opencontainers.image.title="MaterialX CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, Boost and other MaterialX upstream dependencies\ Warning: this image does *not* contain MaterialX itself as it is used to *build* MaterialX!" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-materialx/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-materialx/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-materialx/README.md b/ci-materialx/README.md index d0b1c303..881670f5 100644 --- a/ci-materialx/README.md +++ b/ci-materialx/README.md @@ -16,7 +16,7 @@ for further information, and participate in the discussion on the Contains: Python, Boost and other MaterialX upstream dependencies Warning: this image does *not* contain MaterialX itself as it is used to *build* MaterialX! -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-materialx/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-materialx/Dockerfile) ## [aswf/ci-materialx:2022.1](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2022.1) diff --git a/ci-ocio/Dockerfile b/ci-ocio/Dockerfile index 50eab84f..9a194e46 100644 --- a/ci-ocio/Dockerfile +++ b/ci-ocio/Dockerfile @@ -74,7 +74,7 @@ LABEL org.opencontainers.image.title="OpenColorIO CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, TBB, Boost and other OpenColorIO upstream dependencies\ Warning: this image does *not* contain OpenColorIO itself as it is used to *build* OpenColorIO!" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-ocio/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-ocio/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-ocio/README.md b/ci-ocio/README.md index 2bead5d3..0e2863e4 100644 --- a/ci-ocio/README.md +++ b/ci-ocio/README.md @@ -16,7 +16,7 @@ for further information, and participate in the discussion on the Contains: Python, TBB, Boost and other OpenColorIO upstream dependencies Warning: this image does *not* contain OpenColorIO itself as it is used to *build* OpenColorIO! -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-ocio/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-ocio/Dockerfile) ## [aswf/ci-ocio:2019.9](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2019.9) diff --git a/ci-oiio/Dockerfile b/ci-oiio/Dockerfile index c97cd61e..5e8c431a 100644 --- a/ci-oiio/Dockerfile +++ b/ci-oiio/Dockerfile @@ -72,7 +72,7 @@ LABEL org.opencontainers.image.title="OpenImageIO CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, Boost, OpenEXR, Partio and other OpenImageIO upstream dependencies\ Warning: this image does *not* contain OpenImageIO itself as it is used to *build* OpenImageIO!" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-oiio/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-oiio/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-oiio/README.md b/ci-oiio/README.md index 2c2e0825..a0a016d2 100644 --- a/ci-oiio/README.md +++ b/ci-oiio/README.md @@ -16,7 +16,7 @@ for further information, and participate in the discussion on the Contains: Python, Boost, OpenEXR, Partio and other OpenImageIO upstream dependencies Warning: this image does *not* contain OpenImageIO itself as it is used to *build* OpenImageIO! -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-oiio/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-oiio/Dockerfile) ## [aswf/ci-oiio:2024.1](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2024.1) diff --git a/ci-opencue/Dockerfile b/ci-opencue/Dockerfile index d4d8df14..6338389a 100644 --- a/ci-opencue/Dockerfile +++ b/ci-opencue/Dockerfile @@ -48,7 +48,7 @@ LABEL org.opencontainers.image.title="OpenCue CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, CMake and other OpenCue upstream dependencies\ Warning: this image does *not* contain OpenCue itself as it is used to *build* OpenCue!" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-opencue/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-opencue/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-opencue/README.md b/ci-opencue/README.md index b30a0141..cba7bfc6 100644 --- a/ci-opencue/README.md +++ b/ci-opencue/README.md @@ -16,7 +16,7 @@ for further information, and participate in the discussion on the Contains: Python, CMake and other OpenCue upstream dependencies Warning: this image does *not* contain OpenCue itself as it is used to *build* OpenCue! -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-opencue/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-opencue/Dockerfile) ## [aswf/ci-opencue:2019.10](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2019.10) diff --git a/ci-openexr/Dockerfile b/ci-openexr/Dockerfile index 8c652923..be55a024 100644 --- a/ci-openexr/Dockerfile +++ b/ci-openexr/Dockerfile @@ -52,7 +52,7 @@ LABEL org.opencontainers.image.title="OpenEXR CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, Boost and other OpenEXR upstream dependencies\ Warning: this image does *not* contain OpenEXR itself as it is used to *build* OpenEXR!" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-openexr/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-openexr/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-openexr/README.md b/ci-openexr/README.md index 204f483b..104e9e00 100644 --- a/ci-openexr/README.md +++ b/ci-openexr/README.md @@ -16,7 +16,7 @@ for further information, and participate in the discussion on the Contains: Python, Boost and other OpenEXR upstream dependencies Warning: this image does *not* contain OpenEXR itself as it is used to *build* OpenEXR! -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-openexr/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-openexr/Dockerfile) ## [aswf/ci-openexr:2019.8](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2019.8) diff --git a/ci-openvdb/Dockerfile b/ci-openvdb/Dockerfile index 1e5199a1..3720f2d3 100644 --- a/ci-openvdb/Dockerfile +++ b/ci-openvdb/Dockerfile @@ -68,7 +68,7 @@ LABEL org.opencontainers.image.title="OpenVDB CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, Boost, TBB and other OpenVDB upstream dependencies\ Warning: this image does *not* contain OpenVDB itself as it is used to *build* OpenVDB!" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-openvdb/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-openvdb/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-openvdb/README.md b/ci-openvdb/README.md index 47769a3b..7dd79f25 100644 --- a/ci-openvdb/README.md +++ b/ci-openvdb/README.md @@ -16,7 +16,7 @@ for further information, and participate in the discussion on the Contains: Python, Boost, TBB and other OpenVDB upstream dependencies Warning: this image does *not* contain OpenVDB itself as it is used to *build* OpenVDB! -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-openvdb/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-openvdb/Dockerfile) ## [aswf/ci-openvdb:2019-clang6.8](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2019-clang6.8) diff --git a/ci-osl/Dockerfile b/ci-osl/Dockerfile index d04e7e02..5405a18c 100644 --- a/ci-osl/Dockerfile +++ b/ci-osl/Dockerfile @@ -75,7 +75,7 @@ LABEL org.opencontainers.image.title="OpenShadingLanguage CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, Boost, Qt, OpenEXR, OpenImageIO, Partio and other OpenShadingLanguage upstream dependencies\ Warning: this image does *not* contain OpenShadingLanguage itself as it is used to *build* OpenShadingLanguage!" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-osl/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-osl/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-osl/README.md b/ci-osl/README.md index cb73525c..7b278954 100644 --- a/ci-osl/README.md +++ b/ci-osl/README.md @@ -16,7 +16,7 @@ for further information, and participate in the discussion on the Contains: Python, Boost, Qt, OpenEXR, OpenImageIO, Partio and other OpenShadingLanguage upstream dependencies Warning: this image does *not* contain OpenShadingLanguage itself as it is used to *build* OpenShadingLanguage! -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-osl/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-osl/Dockerfile) ## [aswf/ci-osl:2019-clang6.5](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang6.5) diff --git a/ci-otio/Dockerfile b/ci-otio/Dockerfile index eadf06fd..21020c42 100644 --- a/ci-otio/Dockerfile +++ b/ci-otio/Dockerfile @@ -54,7 +54,7 @@ LABEL org.opencontainers.image.title="OpenTimelineIO CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, Qt, PySide and other OpenTimelineIO upstream dependencies\ Warning: this image does *not* contain OpenTimelineIO itself as it is used to *build* OpenTimelineIO!" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-otio/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-otio/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-otio/README.md b/ci-otio/README.md index a53aee25..12299400 100644 --- a/ci-otio/README.md +++ b/ci-otio/README.md @@ -16,7 +16,7 @@ for further information, and participate in the discussion on the Contains: Python, Qt, PySide and other OpenTimelineIO upstream dependencies Warning: this image does *not* contain OpenTimelineIO itself as it is used to *build* OpenTimelineIO! -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-otio/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-otio/Dockerfile) ## [aswf/ci-otio:2019.3](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2019.3) diff --git a/ci-usd/Dockerfile b/ci-usd/Dockerfile index 31939eb6..9c3afec0 100644 --- a/ci-usd/Dockerfile +++ b/ci-usd/Dockerfile @@ -91,7 +91,7 @@ LABEL org.opencontainers.image.title="USD CI Docker Image" LABEL org.opencontainers.image.description="Contains: Python, Qt, PySide and other USD upstream dependencies\ Warning: this image does *not* contain USD itself as it is used to *build* USD!" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-usd/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-usd/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-usd/README.md b/ci-usd/README.md index 7a68d2e3..bd4b692b 100644 --- a/ci-usd/README.md +++ b/ci-usd/README.md @@ -16,7 +16,7 @@ for further information, and participate in the discussion on the Contains: Python, Qt, PySide and other USD upstream dependencies Warning: this image does *not* contain USD itself as it is used to *build* USD! -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-usd/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-usd/Dockerfile) ## [aswf/ci-usd:2019.9](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2019.9) diff --git a/ci-vfxall/Dockerfile b/ci-vfxall/Dockerfile index ab207a4c..f8a1a5da 100644 --- a/ci-vfxall/Dockerfile +++ b/ci-vfxall/Dockerfile @@ -103,7 +103,7 @@ LABEL org.opencontainers.image.name="$ASWF_ORG/ci-vfxall" LABEL org.opencontainers.image.title="VFX All CI Docker Image" LABEL org.opencontainers.image.description="Contains: all supported VFX packages" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-vfxall/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-vfxall/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/ci-vfxall/README.md b/ci-vfxall/README.md index afac1408..1445a3b8 100644 --- a/ci-vfxall/README.md +++ b/ci-vfxall/README.md @@ -15,7 +15,7 @@ for further information, and participate in the discussion on the Contains: all supported VFX packages -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-vfxall/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-vfxall/Dockerfile) ## [aswf/ci-vfxall:2019-clang6.12](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2019-clang6.12) diff --git a/packages/base2/Dockerfile b/packages/base2/Dockerfile index 6a2fb716..4e9164f0 100644 --- a/packages/base2/Dockerfile +++ b/packages/base2/Dockerfile @@ -83,7 +83,7 @@ LABEL org.opencontainers.image.description="Qt headers and binaries to be instal LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.url="https://www.qt.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/packages/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/Dockerfile" LABEL org.opencontainers.image.version="${ASWF_QT_VERSION}" LABEL org.opencontainers.image.licenses="https://doc.qt.io/qt-5/licenses-used-in-qt.html" LABEL io.aswf.docker.versions.ci-common="${CI_COMMON_VERSION}" diff --git a/packages/base3/Dockerfile b/packages/base3/Dockerfile index 5baab7ec..725f64a9 100644 --- a/packages/base3/Dockerfile +++ b/packages/base3/Dockerfile @@ -115,7 +115,7 @@ LABEL org.opencontainers.image.description="PySide headers and binaries to be in LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.url="https://www.qt.io/qt-for-python" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/packages/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/Dockerfile" LABEL org.opencontainers.image.version="${ASWF_PYSIDE_VERSION}" LABEL org.opencontainers.image.licenses="LGPL-2.1" LABEL io.aswf.docker.versions.ci-common="${CI_COMMON_VERSION}" diff --git a/packages/vfx1/Dockerfile b/packages/vfx1/Dockerfile index 8cba216d..a41aff2a 100644 --- a/packages/vfx1/Dockerfile +++ b/packages/vfx1/Dockerfile @@ -111,7 +111,7 @@ LABEL org.opencontainers.image.description="Imath headers and binaries to be ins LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.url="https://github.com/AcademySoftwareFoundation/imath" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/packages/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/Dockerfile" LABEL org.opencontainers.image.version="${ASWF_IMATH_VERSION}" LABEL org.opencontainers.image.licenses="BSD-3-Clause" LABEL io.aswf.docker.versions.ci-common="${CI_COMMON_VERSION}" @@ -155,7 +155,7 @@ LABEL org.opencontainers.image.description="OpenEXR headers and binaries to be i LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.url="https://github.com/AcademySoftwareFoundation/openexr" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/packages/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/Dockerfile" LABEL org.opencontainers.image.version="${ASWF_OPENEXR_VERSION}" LABEL org.opencontainers.image.licenses="BSD-3-Clause" LABEL io.aswf.docker.versions.ci-common="${CI_COMMON_VERSION}" @@ -237,7 +237,7 @@ LABEL org.opencontainers.image.description="OpenVDB headers and binaries to be i LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.url="https://github.com/AcademySoftwareFoundation/openvdb" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/packages/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/Dockerfile" LABEL org.opencontainers.image.version="${ASWF_OPENVDB_VERSION}" LABEL org.opencontainers.image.licenses="MPL-2.0" LABEL io.aswf.docker.versions.ci-common="${CI_COMMON_VERSION}" @@ -285,7 +285,7 @@ LABEL org.opencontainers.image.description="OpenColorIO headers and binaries to LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.url="https://github.com/AcademySoftwareFoundation/OpenColorIO" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/packages/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/Dockerfile" LABEL org.opencontainers.image.version="${ASWF_OCIO_VERSION}" LABEL org.opencontainers.image.licenses="BSD-3-Clause" LABEL io.aswf.docker.versions.ci-common="${CI_COMMON_VERSION}" @@ -350,7 +350,7 @@ LABEL org.opencontainers.image.description="OpenImageIO headers and binaries to LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.url="https://github.com/OpenImageIO/oiio" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/packages/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/Dockerfile" LABEL org.opencontainers.image.version="${ASWF_OIIO_VERSION}" LABEL org.opencontainers.image.licenses="BSD-3-Clause" LABEL io.aswf.docker.versions.ci-common="${CI_COMMON_VERSION}" diff --git a/packages/vfx2/Dockerfile b/packages/vfx2/Dockerfile index cae96485..c1ea5fb6 100644 --- a/packages/vfx2/Dockerfile +++ b/packages/vfx2/Dockerfile @@ -183,7 +183,7 @@ LABEL org.opencontainers.image.description="OpenShadingLanguage headers and bina LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.url="https://github.com/imageworks/OpenShadingLanguage" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/packages/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/Dockerfile" LABEL org.opencontainers.image.version="${ASWF_OSL_VERSION}" LABEL org.opencontainers.image.licenses="BSD-3-Clause" LABEL io.aswf.docker.versions.ci-common="${CI_COMMON_VERSION}" @@ -290,7 +290,7 @@ LABEL org.opencontainers.image.description="USD (Universal Scene Description) he LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.url="https://github.com/PixarAnimationStudios/USD" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/packages/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/Dockerfile" LABEL org.opencontainers.image.version="${ASWF_USD_VERSION}" LABEL org.opencontainers.image.licenses="Apache-2.0" LABEL io.aswf.docker.versions.ci-common="${CI_COMMON_VERSION}" @@ -358,7 +358,7 @@ LABEL org.opencontainers.image.description="OpenTimelineIO headers and binaries LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.url="https://github.com/PixarAnimationStudios/OpenTimelineIO" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/packages/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/Dockerfile" LABEL org.opencontainers.image.version="${ASWF_OTIO_VERSION}" LABEL org.opencontainers.image.licenses="Apache-2.0" LABEL io.aswf.docker.versions.ci-common="${CI_COMMON_VERSION}" diff --git a/python/aswfdocker/cli/aswfdocker.py b/python/aswfdocker/cli/aswfdocker.py index 3598f371..19d0cc84 100644 --- a/python/aswfdocker/cli/aswfdocker.py +++ b/python/aswfdocker/cli/aswfdocker.py @@ -382,9 +382,9 @@ def release( ) if not sha: - if utils.get_current_branch() != "master": + if utils.get_current_branch() != "main": click.secho( - "Cannot release from non-master branch! Specify --sha to create a release on a given commit.", + "Cannot release from non-main branch! Specify --sha to create a release on a given commit.", fg="red", ) sys.exit(1) diff --git a/python/aswfdocker/data/ci-image-dockerfile.jinja2 b/python/aswfdocker/data/ci-image-dockerfile.jinja2 index b3658f63..e3fc4984 100644 --- a/python/aswfdocker/data/ci-image-dockerfile.jinja2 +++ b/python/aswfdocker/data/ci-image-dockerfile.jinja2 @@ -73,7 +73,7 @@ LABEL org.opencontainers.image.name="$ASWF_ORG/ci-{{ name }}" LABEL org.opencontainers.image.title="{{ title }}" LABEL org.opencontainers.image.description="{{ "\\\n".join(description.strip().split("\n")) }}" LABEL org.opencontainers.image.url="http://aswf.io/" -LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-{{ name }}/Dockerfile" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-{{ name }}/Dockerfile" LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" LABEL org.opencontainers.image.version="${ASWF_VERSION}" diff --git a/python/aswfdocker/data/ci-image-readme.jinja2 b/python/aswfdocker/data/ci-image-readme.jinja2 index 9b893587..ab772630 100644 --- a/python/aswfdocker/data/ci-image-readme.jinja2 +++ b/python/aswfdocker/data/ci-image-readme.jinja2 @@ -15,7 +15,7 @@ for further information, and participate in the discussion on the {{ description | trim }} -[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-{{ name }}/Dockerfile) +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-{{ name }}/Dockerfile) {% for version in index.iter_versions(constants.ImageType.IMAGE, name) -%} ## [aswf/ci-{{name}}:{{version}}](https://hub.docker.com/r/aswf/ci-{{name}}/tags?page=1&name={{version}}) diff --git a/python/aswfdocker/tests/test_utils.py b/python/aswfdocker/tests/test_utils.py index 0e8492ac..9583c87c 100644 --- a/python/aswfdocker/tests/test_utils.py +++ b/python/aswfdocker/tests/test_utils.py @@ -21,7 +21,7 @@ def test_get_docker_org(self): self.assertEqual( utils.get_docker_org( constants.MAIN_GITHUB_ASWF_DOCKER_URL, - "refs/heads/master", + "refs/heads/main", ), "aswf", ) @@ -34,7 +34,7 @@ def test_get_docker_org(self): ) self.assertEqual( utils.get_docker_org( - "https://github.com/randomfork/aswf-docker", "refs/heads/master" + "https://github.com/randomfork/aswf-docker", "refs/heads/main" ), "aswflocaltesting", ) @@ -50,7 +50,7 @@ def test_get_docker_push(self): self.assertTrue( utils.get_docker_push( constants.MAIN_GITHUB_ASWF_DOCKER_URL, - "refs/heads/master", + "refs/heads/main", ) ) self.assertTrue( @@ -61,7 +61,7 @@ def test_get_docker_push(self): ) self.assertFalse( utils.get_docker_push( - "https://github.com/randomfork/aswf-docker", "refs/heads/master" + "https://github.com/randomfork/aswf-docker", "refs/heads/main" ) ) self.assertFalse( @@ -114,7 +114,7 @@ def test_cli_getdockerorgforced(self): "--repo-uri", "https://github.com/AcademySoftwareFoundation/aswf-docker", "--source-branch", - "refs/heads/master", + "refs/heads/main", "getdockerorg", ], ) diff --git a/python/aswfdocker/utils.py b/python/aswfdocker/utils.py index 08d5212f..a7350ea0 100644 --- a/python/aswfdocker/utils.py +++ b/python/aswfdocker/utils.py @@ -40,7 +40,7 @@ def get_docker_org(repo_uri: str, source_branch: str) -> str: if not source_branch and not repo_uri: return constants.TESTING_DOCKER_ORG if ( - source_branch == "refs/heads/master" + source_branch == "refs/heads/main" and constants.MAIN_GITHUB_ASWF_DOCKER_URL.endswith(repo_uri) ): docker_org = constants.PUBLISH_DOCKER_ORG @@ -53,7 +53,7 @@ def get_docker_org(repo_uri: str, source_branch: str) -> str: def get_docker_push(repo_uri: str, source_branch: str) -> bool: if ( - source_branch == "refs/heads/master" + source_branch == "refs/heads/main" and repo_uri == constants.MAIN_GITHUB_ASWF_DOCKER_URL ) or source_branch == "refs/heads/testing": return True