Rework some shell code for supervisor and hwloc
#35579
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
jonjohnsonjr
approved these changes
Dec 1, 2024
jonjohnsonjr
added a commit
to jonjohnsonjr/os
that referenced
this pull request
Dec 5, 2024
This was fixed in wolfi-dev#35579 but not bumped so we have a bad supervisor package: ``` $ curl -sL https://packages.wolfi.dev/os/aarch64/supervisor-4.2.5-r5.apk | tar -Oxz etc/logrotate.d/supervisord /var/log/supervisor/*.log { missingok weekly notifempty nocompress } chmod 600 /home/build/melange-out/supervisor/etc/supervisord.conf chmod 644 /home/build/melange-out/supervisor/etc/logrotate.d/supervisord find "/home/build/melange-out/supervisor" -name "*.pyo" -exec rm -rf '{}' + find "/home/build/melange-out/supervisor" -name "tests" -exec rm -rf '{}' + exit 0 ``` Signed-off-by: Jon Johnson <jon.johnson@chainguard.dev>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This attempts to fix our ability to parse shell code with
melangeby working around parsing bugs in https://github.com/mvdan/sh in a way that hopefully doesn't actually change build logic.We first noticed this problem while seeing wolfictl's CI failing on the latest bump of melange: https://github.com/wolfi-dev/wolfictl/actions/runs/12088082103/job/33710862119?pr=1345
Related to chainguard-dev/melange#1622
cc: @jonjohnsonjr @imjasonh