ci: Fix tagging issues

neomantra · neomantra · commit 4e11a2611df8 · 2026-01-07T12:38:25.000-05:00
Signed-off-by: Evan Wies &lt;evan@neomantra.net&gt;
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -270,6 +270,7 @@ jobs:
           tags: |
             type=raw,value=${{ matrix.flavor }}-${{ matrix.arch }},enable=${{ github.ref == 'refs/heads/master' }}
             type=ref,event=tag,suffix=-${{ matrix.flavor }}-${{ matrix.arch }}
+            type=match,pattern=^(.*)-[0-9]$,group=1,suffix=-${{ matrix.flavor }}-${{ matrix.arch }}
 
       - name: Build and push
         uses: docker/build-push-action@v5
@@ -328,58 +329,71 @@ jobs:
           fi
           
           # Construct source tags
-          SOURCES=""
-          MIRROR_SOURCES=""
+          # We need to handle potential aliases (e.g. 1.2.3-1 -> 1.2.3)
+          # The build job produces both tags for the images if the pattern matches.
           
-          TAG_PREFIX=""
+          declare -a PREFIXES=()
           if [[ "${{ github.ref_type }}" == "tag" ]]; then
-             TAG_PREFIX="${{ github.ref_name }}-"
+             PREFIXES+=("${{ github.ref_name }}-")
+             # Alias logic: Matches tags ending in single digit revision (e.g. -1)
+             TAG_BASE=$(echo "${{ github.ref_name }}" | sed 's/-[0-9]$//')
+             if [[ "$TAG_BASE" != "${{ github.ref_name }}" ]]; then
+                PREFIXES+=("$TAG_BASE-")
+             fi
+          else
+             # For master branch or other non-tags
+             PREFIXES+=("")
           fi
 
-          for ARCH in $ARCHS; do
-            SOURCES="$SOURCES ${{ env.GHCR_IMAGE }}:${TAG_PREFIX}${{ matrix.flavor }}-$ARCH"
+          for TAG_PREFIX in "${PREFIXES[@]}"; do
+            SOURCES=""
+            MIRROR_SOURCES=""
+            
+            for ARCH in $ARCHS; do
+              SOURCES="$SOURCES ${{ env.GHCR_IMAGE }}:${TAG_PREFIX}${{ matrix.flavor }}-$ARCH"
+              if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
+                 MIRROR_SOURCES="$MIRROR_SOURCES ${{ env.DOCKERHUB_IMAGE }}:${TAG_PREFIX}${{ matrix.flavor }}-$ARCH"
+              fi
+            done
+  
+            # Target Manifest Tag
+            TARGET_TAG="${TAG_PREFIX}${{ matrix.flavor }}"
+            
+            echo "Creating manifest $TARGET_TAG from $SOURCES"
+            docker buildx imagetools create -t "${{ env.GHCR_IMAGE }}:$TARGET_TAG" $SOURCES
+            
             if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
-               MIRROR_SOURCES="$MIRROR_SOURCES ${{ env.DOCKERHUB_IMAGE }}:${TAG_PREFIX}${{ matrix.flavor }}-$ARCH"
+               echo "Creating mirror manifest $TARGET_TAG"
+               docker buildx imagetools create -t "${{ env.DOCKERHUB_IMAGE }}:$TARGET_TAG" $MIRROR_SOURCES
+            fi
+            
+            # Handle "latest" tag for bookworm on master
+            if [[ "${{ matrix.flavor }}" == "bookworm" && "${{ github.ref }}" == "refs/heads/master" && "$TAG_PREFIX" == "" ]]; then
+               echo "Tagging bookworm as latest"
+               docker buildx imagetools create -t "${{ env.GHCR_IMAGE }}:latest" "${{ env.GHCR_IMAGE }}:bookworm"
+               if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
+                  docker buildx imagetools create -t "${{ env.DOCKERHUB_IMAGE }}:latest" "${{ env.DOCKERHUB_IMAGE }}:bookworm"
+               fi
+            fi
+            
+            # Create tag aliases (centos-rpm -> centos, fedora-rpm -> fedora)
+            if [[ "${{ matrix.flavor }}" == "centos" ]]; then
+               echo "Creating centos-rpm alias"
+               docker buildx imagetools create -t "${{ env.GHCR_IMAGE }}:${TAG_PREFIX}centos-rpm" "${{ env.GHCR_IMAGE }}:$TARGET_TAG"
+               if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
+                  docker buildx imagetools create -t "${{ env.DOCKERHUB_IMAGE }}:${TAG_PREFIX}centos-rpm" "${{ env.DOCKERHUB_IMAGE }}:$TARGET_TAG"
+               fi
+            fi
+  
+            if [[ "${{ matrix.flavor }}" == "fedora" ]]; then
+               echo "Creating fedora-rpm alias"
+               docker buildx imagetools create -t "${{ env.GHCR_IMAGE }}:${TAG_PREFIX}fedora-rpm" "${{ env.GHCR_IMAGE }}:$TARGET_TAG"
+               if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
+                  docker buildx imagetools create -t "${{ env.DOCKERHUB_IMAGE }}:${TAG_PREFIX}fedora-rpm" "${{ env.DOCKERHUB_IMAGE }}:$TARGET_TAG"
+               fi
             fi
           done
 
-          # Target Manifest Tag
-          TARGET_TAG="${TAG_PREFIX}${{ matrix.flavor }}"
-          
-          echo "Creating manifest $TARGET_TAG from $SOURCES"
-          docker buildx imagetools create -t "${{ env.GHCR_IMAGE }}:$TARGET_TAG" $SOURCES
-          
-          if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
-             echo "Creating mirror manifest $TARGET_TAG"
-             docker buildx imagetools create -t "${{ env.DOCKERHUB_IMAGE }}:$TARGET_TAG" $MIRROR_SOURCES
-          fi
-
-          # Handle "latest" tag for bookworm on master
-          if [[ "${{ matrix.flavor }}" == "bookworm" && "${{ github.ref }}" == "refs/heads/master" ]]; then
-             echo "Tagging bookworm as latest"
-             docker buildx imagetools create -t "${{ env.GHCR_IMAGE }}:latest" "${{ env.GHCR_IMAGE }}:bookworm"
-             if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
-                docker buildx imagetools create -t "${{ env.DOCKERHUB_IMAGE }}:latest" "${{ env.DOCKERHUB_IMAGE }}:bookworm"
-             fi
-          fi
-
-          # Create tag aliases (centos-rpm -> centos, fedora-rpm -> fedora)
-          if [[ "${{ matrix.flavor }}" == "centos" ]]; then
-             echo "Creating centos-rpm alias"
-             docker buildx imagetools create -t "${{ env.GHCR_IMAGE }}:${TAG_PREFIX}centos-rpm" "${{ env.GHCR_IMAGE }}:$TARGET_TAG"
-             if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
-                docker buildx imagetools create -t "${{ env.DOCKERHUB_IMAGE }}:${TAG_PREFIX}centos-rpm" "${{ env.DOCKERHUB_IMAGE }}:$TARGET_TAG"
-             fi
-          fi
-
-          if [[ "${{ matrix.flavor }}" == "fedora" ]]; then
-             echo "Creating fedora-rpm alias"
-             docker buildx imagetools create -t "${{ env.GHCR_IMAGE }}:${TAG_PREFIX}fedora-rpm" "${{ env.GHCR_IMAGE }}:$TARGET_TAG"
-             if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
-                docker buildx imagetools create -t "${{ env.DOCKERHUB_IMAGE }}:${TAG_PREFIX}fedora-rpm" "${{ env.DOCKERHUB_IMAGE }}:$TARGET_TAG"
-             fi
-          fi
-
   build-fat:
     needs: manifest
     runs-on: ubuntu-latest
@@ -465,6 +479,7 @@ jobs:
           tags: |
             type=raw,value=${{ matrix.flavor }}-${{ matrix.arch }},enable=${{ github.ref == 'refs/heads/master' }}
             type=ref,event=tag,suffix=-${{ matrix.flavor }}-${{ matrix.arch }}
+            type=match,pattern=^(.*)-[0-9]$,group=1,suffix=-${{ matrix.flavor }}-${{ matrix.arch }}
 
       - name: Build and push
         uses: docker/build-push-action@v5
@@ -513,26 +528,36 @@ jobs:
         run: |
           ARCHS="amd64 arm64"
           
-          TAG_PREFIX=""
+          declare -a PREFIXES=()
           if [[ "${{ github.ref_type }}" == "tag" ]]; then
-             TAG_PREFIX="${{ github.ref_name }}-"
+             PREFIXES+=("${{ github.ref_name }}-")
+             # Alias logic: Matches tags ending in single digit revision (e.g. -1)
+             TAG_BASE=$(echo "${{ github.ref_name }}" | sed 's/-[0-9]$//')
+             if [[ "$TAG_BASE" != "${{ github.ref_name }}" ]]; then
+                PREFIXES+=("$TAG_BASE-")
+             fi
+          else
+             # For master branch or other non-tags
+             PREFIXES+=("")
           fi
 
-          SOURCES=""
-          MIRROR_SOURCES=""
-          for ARCH in $ARCHS; do
-            SOURCES="$SOURCES ${{ env.GHCR_IMAGE }}:${TAG_PREFIX}${{ matrix.flavor }}-$ARCH"
+          for TAG_PREFIX in "${PREFIXES[@]}"; do
+            SOURCES=""
+            MIRROR_SOURCES=""
+            for ARCH in $ARCHS; do
+              SOURCES="$SOURCES ${{ env.GHCR_IMAGE }}:${TAG_PREFIX}${{ matrix.flavor }}-$ARCH"
+              if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
+                 MIRROR_SOURCES="$MIRROR_SOURCES ${{ env.DOCKERHUB_IMAGE }}:${TAG_PREFIX}${{ matrix.flavor }}-$ARCH"
+              fi
+            done
+  
+            TARGET_TAG="${TAG_PREFIX}${{ matrix.flavor }}"
+            
+            echo "Creating manifest $TARGET_TAG from $SOURCES"
+            docker buildx imagetools create -t "${{ env.GHCR_IMAGE }}:$TARGET_TAG" $SOURCES
+            
             if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
-               MIRROR_SOURCES="$MIRROR_SOURCES ${{ env.DOCKERHUB_IMAGE }}:${TAG_PREFIX}${{ matrix.flavor }}-$ARCH"
+               echo "Creating mirror manifest $TARGET_TAG"
+               docker buildx imagetools create -t "${{ env.DOCKERHUB_IMAGE }}:$TARGET_TAG" $MIRROR_SOURCES
             fi
           done
-
-          TARGET_TAG="${TAG_PREFIX}${{ matrix.flavor }}"
-          
-          echo "Creating manifest $TARGET_TAG from $SOURCES"
-          docker buildx imagetools create -t "${{ env.GHCR_IMAGE }}:$TARGET_TAG" $SOURCES
-          
-          if [[ "${{ vars.ENABLE_DOCKERHUB_MIRROR }}" == "true" ]]; then
-             echo "Creating mirror manifest $TARGET_TAG"
-             docker buildx imagetools create -t "${{ env.DOCKERHUB_IMAGE }}:$TARGET_TAG" $MIRROR_SOURCES
-          fi
diff --git a/AGENTS.md b/AGENTS.md
@@ -0,0 +1,28 @@
+# AGENTS.md
+
+## Repository Overview
+This repository contains the Docker tooling and Dockerfiles for OpenResty. It supports multiple Linux distributions (Alpine, Ubuntu, Debian, CentOS, Fedora, etc.) and architectures (amd64, arm64, s390x).
+
+## CI/CD Architecture
+The project has migrated from Travis CI to **GitHub Actions**.
+
+### Workflow
+The primary workflow is defined in `.github/workflows/docker-publish.yml`.
+- **Primary Registry**: GitHub Container Registry (GHCR). All images are built and pushed here first.
+- **Mirror Registry**: Docker Hub (`openresty/openresty`). This is configured as a mirror. Pushing to Docker Hub is optional and controlled by the `ENABLE_DOCKERHUB_MIRROR` variable/secret.
+- **Fat Images**: "Fat" images (containing additional build tools like OPM) are built in a second stage (`build-fat` job), using the base images newly published to GHCR.
+
+### Workflows
+- `docker-publish.yml`: Handles building, testing (implicit in build), and publishing images. Uses a matrix strategy for different flavors and architectures.
+
+## Verification
+A test script `test-build-actions.sh` is provided to verify the build process locally or in CI.
+
+## Key Files
+- `.github/workflows/docker-publish.yml`: Main CI definition.
+- `README.md`: User-facing documentation.
+- `test-build-actions.sh`: Build verification script.
+
+## Historical Context
+- Previously used Travis CI (`.travis.yml` - removed).
+- Windows builds are/were handled by AppVeyor (`appveyor.yml` - still present).
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 # docker-openresty - Docker tooling for OpenResty
 
-[![Travis Status](https://api.travis-ci.com/openresty/docker-openresty.svg?branch=master)](https://travis-ci.com/github/openresty/docker-openresty)  [![Appveyor status](https://ci.appveyor.com/api/projects/status/github/openresty/docker-openresty?branch=master&svg=true)](https://ci.appveyor.com/project/openresty/docker-openresty)  [![](https://images.microbadger.com/badges/image/openresty/openresty.svg)](https://microbadger.com/#/images/openresty/openresty "microbadger.com")
+[![Build Status](https://github.com/openresty/docker-openresty/actions/workflows/docker-publish.yml/badge.svg?branch=master)](https://github.com/openresty/docker-openresty/actions/workflows/docker-publish.yml)  [![Appveyor status](https://ci.appveyor.com/api/projects/status/github/openresty/docker-openresty?branch=master&svg=true)](https://ci.appveyor.com/project/openresty/docker-openresty)  [![](https://images.microbadger.com/badges/image/openresty/openresty.svg)](https://microbadger.com/#/images/openresty/openresty "microbadger.com")
 
 `docker-openresty` is [Docker](https://www.docker.com) tooling for OpenResty (https://www.openresty.org).
 
 Docker is a container management platform. OpenResty is a full-fledged web application server by
 bundling the standard nginx core, lots of 3rd-party nginx modules, as well as most of their external dependencies.
 
-Thank you to [Travis CI](https://www.travis-ci.com) for donating their build infrastructure to this project for over seven years!
+Thank you to [Travis CI](https://www.travis-ci.com) for donating their build infrastructure to this project for over seven years!  We have since migrated to GitHub Actions.
 
 We provide a series of [pre-built images](#openresty-image-tags) for various operating systems. Some are built-from the upstream OpenResty pre-built images and some are built from source.
 
@@ -63,12 +63,16 @@ There are also specific tags for [Debug](https://openresty.org/en/deb-packages.h
 | `openresty/openresty:bullseye-fat-debug` | Bullseye FAT flavor with `openresty-debug` |
 | `openresty/openresty:bullseye-fat-valgrind` | Bullseye FAT flavor with `openresty-valgrind` |
 
-## Image Mirror
-
-As of `1.27.1.2-6`, we also mirror to the [GitHub Container Registry](https://github.com/users/neomantra/packages/container/package/openresty).  Note this is under the image maintainer's GitHub account and not the OpenResty GitHub account.  To use it, rather than specifying the image`openresty/openresty`, 
-use the full GHCR image path of `ghcr.io/neomantra/openresty`.  For example:
+## Image Registries
+ 
+ The CI/CD pipeline builds images to the [GitHub Container Registry](https://github.com/openresty/docker-openresty/pkgs/container/openresty) (GHCR) as the primary source.
+ 
+ * `ghcr.io/neomantra/openresty`
+ 
+ The images are then mirrored to [Docker Hub](https://hub.docker.com/r/openresty/openresty/) for convenience and backward compatibility.
+ 
+ * `openresty/openresty` (or `docker.io/openresty/openresty`)
 
- * `ghcr.io/neomantra/openresty:1.27.1.2-6-bullseye`
 
 ----
 
@@ -119,7 +123,7 @@ The `openresty/openresty:latest` tag points to the latest `bookworm` image.
 
 Since `1.19.3.2-1`, all flavors support multi-architecture builds, both `amd64` and `aarch64`.  Since `1.21.4.1-1`, the `s390x` architecture is supported for build-from-source Ubuntu flavors (like `jammy`); prior to version `1.27.1.2-3`, [PCRE JIT](https://github.com/zherczeg/sljit/issues/89) is disabled for `s390x`.
 
-Starting with `1.13.6.1`, releases are tagged with `<openresty-version>-<image-version>-<flavor>`.  The latest `image-version` will also be tagged `<openresty-version>-<flavor>`.   The HEAD of the master branch is also labeled plainly as `<flavor>`.  The builds are managed by [Travis-CI](https://travis-ci.com/github/neomantra/docker-openresty) and [Appveyor](https://ci.appveyor.com/project/openresty/docker-openresty) (for Windows images).
+Starting with `1.13.6.1`, releases are tagged with `<openresty-version>-<image-version>-<flavor>`.  The latest `image-version` will also be tagged `<openresty-version>-<flavor>`.   The HEAD of the master branch is also labeled plainly as `<flavor>`.  The builds are managed by [GitHub Actions](https://github.com/openresty/docker-openresty/actions) and [Appveyor](https://ci.appveyor.com/project/openresty/docker-openresty) (for Windows images).
 
 There are architecture-specific tags as well, `<openresty-version>-<image-version>-<flavor>-<arch>`, but one would generally pull from the multi-architecture name above.
 
