Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix superfluous v in s6-overlay versioning #233

Merged
merged 4 commits into from
Mar 30, 2023
Merged

Fix superfluous v in s6-overlay versioning #233

merged 4 commits into from
Mar 30, 2023

Conversation

lmagyar
Copy link
Contributor

@lmagyar lmagyar commented Mar 30, 2023

Proposed Changes

In PR #217 (note the character v)

-ARG S6_OVERLAY_VERSION="3.1.4.0"
+ARG S6_OVERLAY_VERSION="v3.1.4.0"

But this hasn't changed:

COPY s6-overlay /package/admin/s6-overlay-${S6_OVERLAY_VERSION}/

No we've got this:

$ls -liag /package/admin/s6-overlay-3.1.4.1/etc/s6-rc/scripts/
 407304 drwxr-xr-x    2 root          4096 Mar 15 17:12 .
 407303 drwxr-xr-x    4 root          4096 Mar 15 17:09 ..
 407305 -rwxr-xr-x    1 root           574 Mar 15 17:12 cont-finish
 407306 -rwxr-xr-x    1 root           812 Mar 15 17:12 cont-init
 407307 -rwxr-xr-x    1 root           922 Mar 15 17:12 fix-attrs
 407308 -rwxr-xr-x    1 root           457 Mar 15 17:12 services-down
 407309 -rwxr-xr-x    1 root          1935 Mar 15 17:12 services-up
$ ls -liag /package/admin/s6-overlay-v3.1.4.1/etc/s6-rc/scripts/
 408762 drwxr-xr-x    2 root          4096 Mar 28 19:26 .
 408761 drwxr-xr-x    4 root          4096 Mar 28 19:26 ..
 408763 -rwxr-xr-x    1 root          1772 Mar 28 19:26 base-addon-banner
 408764 -rwxr-xr-x    1 root          1567 Mar 28 19:26 base-addon-log-level

This modification is not tested!!! But can't think of any other cause for this issue.


Related Issues

PR #217

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
@frenck frenck added the bugfix Inconsistencies or issues which will cause a problem for users or implementors. label Mar 30, 2023
@frenck frenck changed the title Bugfix for renovate and S6 migration: we have lost banner and log-level setting in all add-on base images Fix superfluous v in overlay versioning Mar 30, 2023
@frenck frenck changed the title Fix superfluous v in overlay versioning Fix superfluous v in s6-overlay versioning Mar 30, 2023

Verified

This commit was signed with the committer’s verified signature. The key has expired.
frenck Franck Nijhof
@frenck frenck self-requested a review as a code owner March 30, 2023 10:26
frenck added 2 commits March 30, 2023 12:27

Verified

This commit was signed with the committer’s verified signature. The key has expired.
frenck Franck Nijhof

Verified

This commit was signed with the committer’s verified signature. The key has expired.
frenck Franck Nijhof
Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

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

Thanks @lmagyar 👍

../Frenck

@frenck frenck merged commit f84dc8a into hassio-addons:main Mar 30, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Apr 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bugfix Inconsistencies or issues which will cause a problem for users or implementors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants