ci(publish): push to quay.io (#130)

coatl-dev · Sep 2, 2024 · d6d9df6 · d6d9df6
1 parent 0371645
commit d6d9df6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -37,7 +37,7 @@ jobs:
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
           echo "major_minor=${MAJOR_MINOR}" >> $GITHUB_OUTPUT
 
-  publish:
+  docker:
     needs: tagger
     uses: coatl-dev/workflows/.github/workflows/docker-build-push-multi-platform.yml@v4
     with:
@@ -50,3 +50,18 @@ jobs:
       build-provenance: true
     secrets:
       registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  quay:
+    needs:
+      - tagger
+      - docker
+    uses: coatl-dev/workflows/.github/workflows/docker-build-push-multi-platform.yml@v4
+    with:
+      registry-image: quay.io/coatldev/six
+      metadata-tags: |
+        type=raw,value=${{ needs.tagger.outputs.version }}
+        type=raw,value=${{ needs.tagger.outputs.major_minor }}
+        type=raw,value=latest,enable={{is_default_branch}}
+      registry-username: ${{ vars.QUAY_USERNAME }}
+    secrets:
+      registry-password: ${{ secrets.QUAY_ROBOT_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
@@ -263,7 +263,7 @@ RUN set -eux; \
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
 ENV PYTHON3_PIP_VERSION=24.2
-ENV PYTHON3_SETUPTOOLS_VERSION=74.0.0
+ENV PYTHON3_SETUPTOOLS_VERSION=74.1.0
 ENV PYTHON3_WHEEL_VERSION=0.44.0
 # https://github.com/pypa/get-pip
 ENV PYTHON_GET_PIP_URL=https://github.com/raw/pypa/get-pip/HEAD/public/get-pip.py

diff --git a/README.md b/README.md
@@ -1,14 +1,16 @@
 # coatldev/six
 
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/coatl-dev/docker-six/coatl.svg "pre-commit.ci status")](https://results.pre-commit.ci/latest/github/coatl-dev/docker-six/coatl)
-[![Docker Pulls](https://img.shields.io/docker/pulls/coatldev/six "Docker Pulls")](https://hub.docker.com/r/coatldev/six)
-[![Docker Repository on Quay](https://quay.io/repository/coatldev/six/status "Docker Repository on Quay")](https://quay.io/repository/coatldev/six)
+[![Docker Repository on Docker Hub](https://img.shields.io/badge/hub.docker.com-white?logo=docker "Docker Repository on Docker Hub")](https://hub.docker.com/r/coatldev/six)
+[![Docker Repository on Quay](https://img.shields.io/badge/quay.io-red?logo=red-hat "Docker Repository on Quay")](https://quay.io/repository/coatldev/six)
 
 Docker image based on Ubuntu 24.04 (Noble Numbat) with Python 3.12 and 2.7.18
 pre-installed.
 
 ## Supported tags
 
+- [`3.12`, `latest`]
+
 For the full list of supported tags, see:
 
 - [Docker Hub tags]
@@ -19,7 +21,7 @@ For the full list of supported tags, see:
 |Container image registry|amd64|arm64|
 |------------------------|-----|-----|
 |[Docker Hub]            | ✅ | ✅ |
-|[Quay.io]               | ✅ | N/A |
+|[Quay.io]               | ✅ | ✅ |
 
 ## How to use this image
 
@@ -139,6 +141,7 @@ Based on the [Docker "Official Image"] for [python] using the following
 - [3.12/slim-bullseye]
 
 <!-- External links -->
+[3.12, latest]: https://github.com/coatl-dev/docker-six/blob/coatl/Dockerfile
 [Azure Pipelines]: https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema/jobs-job-container?view=azure-pipelines
 [GitHub Workflows]: https://docs.github.com/en/actions/using-jobs/running-jobs-in-a-container
 [Docker Hub]: https://hub.docker.com/r/coatldev/six

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -10,5 +10,5 @@ wheel==0.44.0
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.2
     # via -r base.in
-setuptools==74.0.0
+setuptools==74.1.0
     # via -r base.in