From 1e8af5bae022028e89f930a9a3c4a5c18e97e519 Mon Sep 17 00:00:00 2001
From: Luke Heath <luke@fleetdm.com>
Date: Thu, 21 May 2026 10:39:32 -0500
Subject: [PATCH] Add OCI version labels to Fleet container images (#45981)

---
 .goreleaser-snapshot.yml      | 2 ++
 .goreleaser.yml               | 2 ++
 tools/fleet-docker/Dockerfile | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/.goreleaser-snapshot.yml b/.goreleaser-snapshot.yml
index b3da06514e..a430c832d0 100644
--- a/.goreleaser-snapshot.yml
+++ b/.goreleaser-snapshot.yml
@@ -71,5 +71,7 @@ dockers:
       - fleet
       - fleetctl
     dockerfile: tools/fleet-docker/Dockerfile
+    build_flag_templates:
+      - "--build-arg=FLEET_VERSION={{.Version}}"
     image_templates:
       - 'fleetdm/fleet:{{ envOrDefault "DOCKER_IMAGE_TAG" .Branch }}'
diff --git a/.goreleaser.yml b/.goreleaser.yml
index f7e5a662ae..6b36488865 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -127,6 +127,8 @@ dockers:
       - fleet
       - fleetctl
     dockerfile: tools/fleet-docker/Dockerfile
+    build_flag_templates:
+      - "--build-arg=FLEET_VERSION={{.Version}}"
     image_templates:
       - "fleetdm/fleet:{{ .Tag }}"
       - "fleetdm/fleet:v{{ .Major }}"
diff --git a/tools/fleet-docker/Dockerfile b/tools/fleet-docker/Dockerfile
index a49b275181..5673cdb6f5 100644
--- a/tools/fleet-docker/Dockerfile
+++ b/tools/fleet-docker/Dockerfile
@@ -1,5 +1,10 @@
 FROM alpine:3.23.4@sha256:5b10f432ef3da1b8d4c7eb6c487f2f5a8f096bc91145e68878dd4a5019afde11
+ARG FLEET_VERSION=unknown
 LABEL maintainer="Fleet Developers"
+LABEL org.opencontainers.image.version="${FLEET_VERSION}"
+LABEL org.opencontainers.image.vendor="Fleet Device Management Inc."
+LABEL org.opencontainers.image.title="fleet"
+LABEL org.opencontainers.image.source="https://github.com/fleetdm/fleet"
 
 RUN apk --update add ca-certificates
 RUN apk --no-cache add jq