Skip to content

fix(docker-base): skip curl include symlink when target already exists #19

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.

Sign up for GitHub

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

Merged
nathanaelytj merged 2 commits into from
Jun 5, 2026
Merged

fix(docker-base): skip curl include symlink when target already exists #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b8efe6
fix(docker-base): skip curl include symlink when target already exists
nathanaelytj Jun 5, 2026
da99121
ci(codacy): assign unique SARIF run categories before upload
nathanaelytj Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/codacy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ jobs:

max-allowed-issues: 2147483647

- name: Assign unique categories to SARIF runs
# upload-sarif rejects files containing multiple runs with the same
# category (derived from automationDetails.id). Set a distinct id on
# every run so CodeQL accepts the upload.
# See: https://github.blog/changelog/2025-07-21-code-scanning-will-stop-combining-multiple-sarif-runs-uploaded-in-the-same-sarif-file/
run: |
jq '.runs |= (to_entries | map(.value.automationDetails.id = "codacy-run-\(.key)" | .value))' results.sarif > results.fixed.sarif && mv results.fixed.sarif results.sarif

- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion docker-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN set -eux; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [ ! -d /usr/include/curl ]; then \
if [ ! -d /usr/include/curl ] && [ ! -e /usr/local/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
export \
Expand Down
Loading