From 9b2ee795e047c9c11dce9b7ddbe316dcb15d4196 Mon Sep 17 00:00:00 2001 From: Scott Todd Date: Thu, 22 Aug 2024 14:26:28 -0700 Subject: [PATCH 1/3] Change image names from nod-ai to iree-org. --- .github/workflows/publish_amdgpu_x86_64.yml | 4 ++-- .github/workflows/publish_cpubuilder_x86_64.yml | 2 +- .github/workflows/publish_manylinux_ghr_x86_64.yml | 2 +- .github/workflows/publish_manylinux_x86_64.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish_amdgpu_x86_64.yml b/.github/workflows/publish_amdgpu_x86_64.yml index debbffe..cf45454 100644 --- a/.github/workflows/publish_amdgpu_x86_64.yml +++ b/.github/workflows/publish_amdgpu_x86_64.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest env: REGISTRY: ghcr.io - IMAGE_NAME: nod-ai/amdgpu_ubuntu_jammy_x86_64 + IMAGE_NAME: iree-org/amdgpu_ubuntu_jammy_x86_64 # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job. permissions: contents: read @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest env: REGISTRY: ghcr.io - IMAGE_NAME: nod-ai/amdgpu_ubuntu_jammy_ghr_x86_64 + IMAGE_NAME: iree-org/amdgpu_ubuntu_jammy_ghr_x86_64 # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job. permissions: contents: read diff --git a/.github/workflows/publish_cpubuilder_x86_64.yml b/.github/workflows/publish_cpubuilder_x86_64.yml index 06d8855..d6a69b6 100644 --- a/.github/workflows/publish_cpubuilder_x86_64.yml +++ b/.github/workflows/publish_cpubuilder_x86_64.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest env: REGISTRY: ghcr.io - IMAGE_NAME: nod-ai/cpubuilder_ubuntu_jammy_ghr_x86_64 + IMAGE_NAME: iree-org/cpubuilder_ubuntu_jammy_ghr_x86_64 # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job. permissions: contents: read diff --git a/.github/workflows/publish_manylinux_ghr_x86_64.yml b/.github/workflows/publish_manylinux_ghr_x86_64.yml index 70f5abe..4960f70 100644 --- a/.github/workflows/publish_manylinux_ghr_x86_64.yml +++ b/.github/workflows/publish_manylinux_ghr_x86_64.yml @@ -9,7 +9,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: nod-ai/manylinux_ghr_x86_64 + IMAGE_NAME: iree-org/manylinux_ghr_x86_64 jobs: build-and-push-image: diff --git a/.github/workflows/publish_manylinux_x86_64.yml b/.github/workflows/publish_manylinux_x86_64.yml index 9c4da27..4907da5 100644 --- a/.github/workflows/publish_manylinux_x86_64.yml +++ b/.github/workflows/publish_manylinux_x86_64.yml @@ -9,7 +9,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: nod-ai/manylinux_x86_64 + IMAGE_NAME: iree-org/manylinux_x86_64 jobs: build-and-push-image: @@ -42,4 +42,4 @@ jobs: file: dockerfiles/manylinux_x86_64.Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file + labels: ${{ steps.meta.outputs.labels }} From adb972558663371213c141ec7f0cbe2f67674039 Mon Sep 17 00:00:00 2001 From: Scott Todd Date: Thu, 22 Aug 2024 14:26:44 -0700 Subject: [PATCH 2/3] Update URLs from openxla to iree-org. --- dockerfiles/manylinux_ghr_x86_64.Dockerfile | 2 +- dockerfiles/manylinux_x86_64.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/manylinux_ghr_x86_64.Dockerfile b/dockerfiles/manylinux_ghr_x86_64.Dockerfile index af3d198..0854906 100644 --- a/dockerfiles/manylinux_ghr_x86_64.Dockerfile +++ b/dockerfiles/manylinux_ghr_x86_64.Dockerfile @@ -23,7 +23,7 @@ RUN groupadd -g 121 runner \ # Git started enforcing strict user checking, which thwarts version # configuration scripts in a docker image where the tree was checked # out by the host and mapped in. Disable the check. -# See: https://github.com/openxla/iree/issues/12046 +# See: https://github.com/iree-org/iree/issues/12046 # We use the wildcard option to disable the checks. This was added # in git 2.35.3 RUN git config --global --add safe.directory '*' diff --git a/dockerfiles/manylinux_x86_64.Dockerfile b/dockerfiles/manylinux_x86_64.Dockerfile index 105e71d..ab9cac4 100644 --- a/dockerfiles/manylinux_x86_64.Dockerfile +++ b/dockerfiles/manylinux_x86_64.Dockerfile @@ -31,7 +31,7 @@ RUN ./install_bazel.sh && rm -rf /install-bazel # Git started enforcing strict user checking, which thwarts version # configuration scripts in a docker image where the tree was checked # out by the host and mapped in. Disable the check. -# See: https://github.com/openxla/iree/issues/12046 +# See: https://github.com/iree-org/iree/issues/12046 # We use the wildcard option to disable the checks. This was added # in git 2.35.3 RUN git config --global --add safe.directory '*' From 9622df3574024ac275d7faf8c923ea8cb6d90338 Mon Sep 17 00:00:00 2001 From: Scott Todd Date: Thu, 22 Aug 2024 14:45:27 -0700 Subject: [PATCH 3/3] Tidy up README. --- README.md | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1d6cd55..e9e663d 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,35 @@ -# docker-build +# base-docker-images + Utility repository for publishing docker images that we depend on. -These images build and publish automatically by GH actions. To -build locally, use a command like: +These images build and publish automatically using GitHub Actions. + +## Available images + +Images with `ghr` in their name are configured as GitHub Actions Runners. + +Image name | Description +---------- | ----------- +`iree-org/amdgpu_ubuntu_jammy_x86_64`
`iree-org/amdgpu_ubuntu_jammy_ghr_x86_64` | Ubuntu with AMDGPU deps +`iree-org/cpubuilder_ubuntu_jammy_ghr_x86_64` | CPU builder with IREE build deps +`iree-org/manylinux_x86_64`
`iree-org/manylinux_ghr_x86_64` | Portable Linux release builder for Python packaging + +## Using published images + +Images are published to the GitHub Container registry which uses the +`https://ghcr.io` package namespace. See +[GitHub's documentation](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry) +for full details. + +For typical usage, reference each image using syntax like +`ghcr.io/iree-org/manylinux_x86_64:main`. + +## Building locally + +To build locally, use a command like: ``` -docker buildx build --file dockerfiles/some.Dockerfile . +sudo docker buildx build --file dockerfiles/some.Dockerfile . ``` This will print a SHA image id, which you can run with: