Skip to content

fix(Docker): Fix logging of commit IDs - #10135

Merged
mergify[bot] merged 2 commits into
mainfrom
fix-docker-sha
Nov 27, 2025
Merged

fix(Docker): Fix logging of commit IDs#10135
mergify[bot] merged 2 commits into
mainfrom
fix-docker-sha

Conversation

@upbqdn

@upbqdn upbqdn commented Nov 27, 2025

Copy link
Copy Markdown
Member

Motivation

Solution

Tests

  • Manually checked that the zebrad field is not present in logs in a container running from a locally built image:

    2025-11-27T09:14:15.363752Z  INFO {net="Main"}: zebrad::commands::start: Starting zebrad
    

PR Checklist

  • The PR name is suitable for the release notes.
  • The PR follows the contribution guidelines.
  • The library crate changelogs are up to date.
  • The solution is tested.
  • The documentation is up to date.

@upbqdn upbqdn self-assigned this Nov 27, 2025
@upbqdn upbqdn added C-bug Category: This is a bug devops Build, CI, test infrastructure, release process labels Nov 27, 2025

@gustavovalverde gustavovalverde left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mergify

mergify Bot commented Nov 27, 2025

Copy link
Copy Markdown
Contributor

Merge Queue Status Beta

✅ The pull request has been merged

This pull request spent 11 minutes 6 seconds in the queue, with no time waiting for CI.
The checks were run in-place.

Required conditions to merge
  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
  • #review-threads-unresolved = 0 [🛡 GitHub repository ruleset rule]
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = mergefreeze
    • check-neutral = mergefreeze
    • check-skipped = mergefreeze
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = test crate build success
    • check-neutral = test crate build success
    • check-skipped = test crate build success
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = lint success
    • check-neutral = lint success
    • check-skipped = lint success
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = test success
    • check-neutral = test success
    • check-skipped = test success
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = mergefreeze
    • check-neutral = mergefreeze
    • check-skipped = mergefreeze

@mergify mergify Bot added the queued label Nov 27, 2025
@mergify
mergify Bot merged commit 2bf7481 into main Nov 27, 2025
77 of 81 checks passed
@mergify
mergify Bot deleted the fix-docker-sha branch November 27, 2025 09:53
@mergify mergify Bot removed the queued label Nov 27, 2025
mnm458 pushed a commit to mnm458/zebra that referenced this pull request Feb 2, 2026
* Do not pass short SHA to production images

* Use short SHA only if it is set in Docker
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C-bug Category: This is a bug devops Build, CI, test infrastructure, release process

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Docker images mishandle commit IDs

2 participants