Introduce tagging per major, minor, patch version. Add OCI labels.

Author: TrafeX

.github/workflows/build.yaml

@@ -28,7 +28,11 @@ jobs:
 
       - name: Build image
         run: |-
-          docker build -t $IMAGE_NAME:$IMAGE_TAG .
+          docker build \
+            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+            --build-arg VCS_REF=${{ github.sha }} \
+            --build-arg VERSION=${{ github.ref_name }} \
+            -t $IMAGE_NAME:$IMAGE_TAG .
 
       - name: Smoke test image
         run: |-
@@ -63,19 +67,41 @@ jobs:
             --cache-from=$IMAGE_NAME:latest \
             --push \
             -t $IMAGE_NAME:latest \
-            --platform linux/amd64,linux/arm64,linux/arm/v7 \
+            --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 \
+            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+            --build-arg VCS_REF=${{ github.sha }} \
+            --build-arg VERSION=latest \
             .
 
-      - name: Set tag in environment
+      - name: Parse version components
         if: contains(github.ref, 'refs/tags/')
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+        id: parse_version
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/}
+          echo "FULL_VERSION=$VERSION" >> $GITHUB_ENV
 
-      - name: Build multi-arch image and push release tag
+          # Extract base version without revision for parsing (e.g., 6.8.1 from 6.8.1-1)
+          BASE=$(echo $VERSION | cut -d- -f1)
+
+          # Extract major version (e.g., 6 from 6.8.1)
+          MAJOR=$(echo $BASE | cut -d. -f1)
+          echo "MAJOR_VERSION=$MAJOR" >> $GITHUB_ENV
+
+          # Extract minor version (e.g., 6.8 from 6.8.1)
+          MINOR=$(echo $BASE | cut -d. -f1,2)
+          echo "MINOR_VERSION=$MINOR" >> $GITHUB_ENV
+
+      - name: Build multi-arch image and push release tags
         if: contains(github.ref, 'refs/tags/')
         run: |-
           docker buildx build \
             --cache-from=$IMAGE_NAME:latest \
             --push \
-            -t $IMAGE_NAME:$RELEASE_VERSION \
-            --platform linux/amd64,linux/arm64,linux/arm/v7 \
+            -t $IMAGE_NAME:$FULL_VERSION \
+            -t $IMAGE_NAME:$MINOR_VERSION \
+            -t $IMAGE_NAME:$MAJOR_VERSION \
+            --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 \
+            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+            --build-arg VCS_REF=${{ github.sha }} \
+            --build-arg VERSION=$FULL_VERSION \
             .

Dockerfile

@@ -1,6 +1,21 @@
 FROM alpine:3.23
-LABEL Maintainer="Tim de Pater <[email protected]>" \
-  Description="Lightweight WordPress container with Nginx 1.26 & PHP-FPM 8.4 based on Alpine Linux."
+
+# Build arguments for OCI annotations
+ARG BUILD_DATE
+ARG VERSION
+ARG VCS_REF
+
+# OCI annotations
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="Tim de Pater <[email protected]>"
+LABEL org.opencontainers.image.url="https://github.com/TrafeX/docker-wordpress"
+LABEL org.opencontainers.image.documentation="https://github.com/TrafeX/docker-wordpress"
+LABEL org.opencontainers.image.source="https://github.com/TrafeX/docker-wordpress"
+LABEL org.opencontainers.image.version="${VERSION}"
+LABEL org.opencontainers.image.revision="${VCS_REF}"
+LABEL org.opencontainers.image.vendor="TrafeX"
+LABEL org.opencontainers.image.title="WordPress with Nginx 1.28 & PHP-FPM 8.4"
+LABEL org.opencontainers.image.description="Lightweight WordPress container with Nginx 1.28 & PHP-FPM 8.4 based on Alpine Linux."
 
 # Install packages
 RUN apk --no-cache add \
@@ -52,8 +67,8 @@ WORKDIR /var/www/wp-content
 RUN chown -R nobody:nobody /var/www
 
 # WordPress
-ENV WORDPRESS_VERSION 6.9
-ENV WORDPRESS_SHA1 256dda5bb6a43aecd806b7a62528f442c06e6c25
+ENV WORDPRESS_VERSION=6.9
+ENV WORDPRESS_SHA1=256dda5bb6a43aecd806b7a62528f442c06e6c25
 
 RUN mkdir -p /usr/src
 
@@ -65,7 +80,7 @@ RUN curl -o wordpress.tar.gz -SL https://wordpress.org/wordpress-${WORDPRESS_VER
   && chown -R nobody:nobody /usr/src/wordpress
 
 # Add WP CLI
-ENV WP_CLI_CONFIG_PATH /usr/src/wordpress/wp-cli.yml
+ENV WP_CLI_CONFIG_PATH=/usr/src/wordpress/wp-cli.yml
 RUN curl -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \
   && chmod +x /usr/local/bin/wp
 COPY --chown=nobody:nobody wp-cli.yml /usr/src/wordpress/

README.md

@@ -1,7 +1,7 @@
 
 # WordPress Docker Container
 
-Lightweight WordPress container with Nginx 1.26 & PHP-FPM 8.4 based on Alpine Linux.
+Lightweight WordPress container with Nginx 1.28 & PHP-FPM 8.4 based on Alpine Linux.
 
 _WordPress version currently installed:_ **6.9**
 
@@ -17,14 +17,32 @@ _WordPress version currently installed:_ **6.9**
 * Fully configurable because wp-config.php uses the environment variables you can pass as an argument to the container
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/trafex/wordpress.svg)](https://hub.docker.com/r/trafex/wordpress/)
-![nginx 1.26](https://img.shields.io/badge/nginx-1.26-brightgreen.svg)
+![nginx 1.28](https://img.shields.io/badge/nginx-1.28-brightgreen.svg)
 ![php 8.4](https://img.shields.io/badge/php-8.4-brightgreen.svg)
 ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg)
 
 ## [![Trafex Consultancy](https://timdepater.com/logo/mini-logo.png)](https://timdepater.com?mtm_campaign=github)
 I can help you with [Containerization, Kubernetes, Monitoring, Infrastructure as Code and other DevOps challenges](https://timdepater.com/?mtm_campaign=github).
 
 ## Usage
+
+### Versioning
+
+This image follows the **Debian versioning convention** for tagging: `<wordpress-version>-<container-revision>`
+
+**Available tags:**
+* `latest` - Latest stable release
+* `<major>.<minor>.<patch>-<revision>` - Full version (e.g., `6.8.1-1`, `6.8.1-2`)
+  * The first part (`6.8.1`) tracks the WordPress version included
+  * The revision number (`-1`, `-2`) indicates container updates (security patches, dependency updates, configuration changes)
+* `<major>.<minor>.<patch>` - Latest container revision for a WordPress version (e.g., `6.8.1` → `6.8.1-2`)
+* `<major>.<minor>` - Latest patch and revision (e.g., `6.8` → `6.8.1-2`)
+* `<major>` - Latest minor, patch and revision (e.g., `6` → `6.8.1-2`)
+
+**For production use**, pin to a specific full version tag (e.g., `trafex/wordpress:6.8.1-1`) to ensure reproducible deployments and controlled updates.
+
+### Running the Container
+
 See [docker-compose.yml](https://github.com/TrafeX/docker-wordpress/blob/master/docker-compose.yml) how to use it in your own environment.
 
     docker-compose up