This repository was archived by the owner on Dec 17, 2025. It is now read-only.

feat: add open container version to log messages - #2001

Open

aauren wants to merge 1955 commits into

containrrr:mainfrom

aauren:add_opencontainer_version_to_log

aauren commented Jul 14, 2024

What This PR Does

It adds the opencontainers image version to the update log if it exists on the container to give a better description of what the upgrade actually is.

As the issue that I linked below points out, org.opencontainers.image.version is a piloted standard to bring more consistency to container labels. All containers built via GitHub actions add them. Additionally, all containers from linuxserver contain them as well.

Related Issues

This is partially related to #1848

Although in that issue, they were asking that this information be added to watchtower's templating function. I don't actually use the templating function, so I didn't put it there, but I would imagine that making container labels available via the template functions would be a much larger PR.

Testing

I have been running with this setup for several days and it has worked great for me.

Example Output

Found new [lscr.io/linuxserver/nzbhydra2:latest](http://lscr.io/linuxserver/nzbhydra2:latest) image (fbeb6b7869e3 - v7.3.0-ls16)
Stopping /nzbhydra2 (387cd3eb4f70 - v7.2.3-ls15) with SIGTERM
Creating /nzbhydra2
Removing image ba50bb7dfb51

aauren requested a review from simonaronsson as a code owner

July 14, 2024 17:28

github-actions Bot reviewed

View reviewed changes

github-actions Bot left a comment

Congratulations on opening your first pull request! We'll get back to you as soon as possible. In the meantime, please make sure you've updated the documentation to reflect your changes and have added test automation as needed. Thanks! 🙏🏼

aauren force-pushed the add_opencontainer_version_to_log branch from 4a1e6b2 to d60d5bb Compare

September 8, 2025 23:24

aauren requested a review from piksel as a code owner

September 8, 2025 23:24

aauren force-pushed the add_opencontainer_version_to_log branch 3 times, most recently from bdc9864 to 1c2b7b1 Compare

April 6, 2026 16:33

github-actions Bot and others added 23 commits

June 24, 2026 10:05


          docs(changelog): update changelog (containrrr#1846)

e2f0a0a

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update nicholas-fedor/actionlint-action action to v1.0.14 (

6a5d066

containrrr#1849)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (containrrr#1850)

2f25706

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update module golang.org/x/tools to v0.47.0 (containrrr#…

0e09405

…1853)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (containrrr#1854)

adda3b5

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update actions/attest-build-provenance action to v4.1.1 (c…

e4a8dc7

…ontainrrr#1855)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update module github.com/docker/cli to v29.6.1+incompati…

c229f80

…ble (containrrr#1856)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (#1857)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update nicholas-fedor/go-proxy-pull-action action to v1.…

d029c72

…1.9 (containrrr#1858)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update actions/cache action to v6.1.0 (containrrr#1859)

8ecc788

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (containrrr#1860)

a22e6b3

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update module github.com/prometheus/procfs to v0.21.0 (c…

0c6cd38

…ontainrrr#1861)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (#1862)

2b96802

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update nicholas-fedor/actionlint-action action to v1.0.15 (

251f5cf

containrrr#1863)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update nicholas-fedor/go-proxy-pull-action action to v1.…

a1b2a8e

…1.10 (containrrr#1864)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update goreleaser/goreleaser-action action to v7.2.3 (co…

a17e3eb

…ntainrrr#1867)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (containrrr#1865)

15e95e9

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update golangci/golangci-lint-action action to v9.3.0 (c…

ac1c659

…ontainrrr#1868)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (#1869)

20ec70f

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update module github.com/prometheus/procfs to v0.21.1 (c…

37951bf

…ontainrrr#1870)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (containrrr#1871)

50806a2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update docker/setup-qemu-action action to v4.2.0 (contai…

bd0e882

…nrrr#1872)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update github/codeql-action action to v4.36.3 (containrr…

709af4f

…r#1874)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

github-actions Bot and others added 29 commits

August 3, 2026 22:51


          docs(changelog): update changelog (#2092)

7f6bac2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update github/codeql-action action to v4.37.6 (containrr…

4f38ee3

…r#2094)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (containrrr#2095)

1620c12

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update module go.opentelemetry.io/contrib/instrumentatio…

bd0cfdb

…n/net/http/otelhttp to v0.70.0 (containrrr#2096)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (#2097)

03e9c6c

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update nicholas-fedor/go-proxy-pull-action action to v1.…

26656c0

…1.38 (containrrr#2098)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update module github.com/nicholas-fedor/shoutrrr to v0.1…

9aa9221

…7.0 (containrrr#2099)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (#2100)

dcc6e4a

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update nicholas-fedor/go-proxy-pull-action action to v1.…

704e1b8

…1.39 (containrrr#2101)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update step-security/harden-runner action to v2.20.1 (co…

b1b43d5

…ntainrrr#2102)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (containrrr#2103)

02239a7

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          fix: clear engine-generated MACs on container recreation (containrrr#…

53cb692

…2106)

- Detect Docker bridge driver generated MACs derived from IPv4 address
- Clear engine-generated MACs during endpoint processing
- Preserve user-configured MAC addresses that do not match the IP pattern
- Allow intentionally cleared engine-generated MACs to pass `validateMacAddresses`
- Add tests for engine-generated MAC detection, clearing logic, and validation waiver behavior
- Update existing test fixtures to use user-configured MACs where preservation is the expected behavior


          docs(changelog): update changelog (containrrr#2107)

7b0ff4e

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          fix(update): increase create/start timeout and use fresh contexts for…

f89c76a

… recovery (containrrr#2108)

* fix(actions): ensure sufficient timeout for container create/start during restart

- Use max of configured timeout and defaultCreateStartTimeout for detached context
- Create fresh contexts for rename-back and cleanup operations
- Add test coverage for timeout minimums and context distinctness

* test(actions): validate context propagation for container create and start operations

- Verify CreateContainer and StartContainerByID receive the same detached context as SetNoRestartPolicy
- Ensure deadline consistency across container lifecycle operations during restart flow


          chore(deps): update dependency python to v3.14.7 (containrrr#2112)

9e0a887

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (containrrr#2113)

6221a06

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          docs(changelog): update changelog (containrrr#2114)

ed4278f

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          fix(cleanup): remove orphaned Watchtower containers stuck in created …

d54369c

…state (containrrr#2109)

* fix(cleanup): remove orphaned Watchtower containers stuck in created state

- Detect and remove Watchtower containers left in created state after failed self-update
- Add IsCreated() method to Container interface with implementation and mock updates
- Validate container scope matches current scope during orphaned cleanup
- Add comprehensive test coverage for orphaned created-state container scenarios

* test(actions): remove obsolete deadline absence assertions from detached context tests

- Celete outdated else branch that expected no deadlines on CreateContainer and StartContainerByID contexts
- Align test expectations with enforced timeout propagation for container lifecycle operations


          fix: recover orphaned Watchtower containers on startup (containrrr#2110)

6f7c141

* fix(recovery): attempt to start orphaned Watchtower containers stuck in created state

- Add TryRecoverOrphanedContainer to recover containers from failed self-updates
- Invoke recovery during pre-run and update flows before setting no-restart policy
- Validate container scope matches current scope during recovery attempts
- Add dedicated test suite for recovery scenarios and context cancellation behavior

* fix: isolate timeout context and add scope validation for orphaned Watchtower containers

- Use dedicated recoverCtx with restartPolicyTimeout instead of shared exit or restart policy contexts
- Extract isRecoverableOrphan helper to centralize eligibility checks for container recovery
- Enforce scope matching to prevent cross-scope recovery of orphaned containers
- Replace busy-wait synchronization loops with gomega.Eventually in detached context tests
- Add test coverage for scope mismatch scenarios in update_recovery_test.go


          docs(changelog): update changelog (containrrr#2115)

2cc970b

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update module github.com/klauspost/compress to v1.19.2 (c…

0dafb4c

…ontainrrr#2116)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (#2117)

d938040

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          chore(deps): update module github.com/docker/cli to v29.7.2+incompati…

c65b12e

…ble (containrrr#2118)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update actions/attest-build-provenance action to v4.2.2 (c…

58ebf9a

…ontainrrr#2120)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update nicholas-fedor/go-proxy-pull-action action to v1.…

827f595

…1.40 (containrrr#2121)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(changelog): update changelog (containrrr#2122)

8ca5035

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          fix(notifications): validate required fields and standardize error me…

4a155d3

…ssages (containrrr#2124)

- Add fatal validation for empty email from, to, and server fields
- Add fatal validation for empty Slack hook URL
- Simplify Gotify token and URL error messages
- Simplify Microsoft Teams webhook URL error message
- Add tests for empty required field validation


          docs(changelog): update changelog (containrrr#2125)

609a1fd

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          feat: show OCI image versions in update notifications

8e7f199

Include org.opencontainers.image.version labels in email notifications
when a new image is found. Both the old (current) and new image versions
are displayed on a single line, making version transitions easy to see
at a glance. Example output:

  Found new image: ghcr.io/homarr-labs/homarr:latest (b7734c440450) v0.15.0 -> v0.16.0

The version is extracted from the new image during the staleness check
and from the running container's labels for the old version. Images
without the OCI version label are displayed without version info.

aauren force-pushed the add_opencontainer_version_to_log branch from 1c2b7b1 to 8e7f199 Compare

August 9, 2026 00:18

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet