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

Remove openssl reinstall, as base image has updated version from alpine 3.18.5 #3181

Merged
merged 12 commits into from
Dec 9, 2023

Conversation

echoix
Copy link
Collaborator

@echoix echoix commented Dec 3, 2023

Removes a fix added in #3086, since the python base image is based off alpine 3.18.5, released recently, and it includes a fixed version of the package.

Proposed Changes

Readiness Checklist

Author/Contributor

  • Add entry to the CHANGELOG listing the change and linking to the corresponding issue (if appropriate)
  • If documentation is needed for this change, has that been included in this pull request

Reviewing Maintainer

  • Label as breaking if this is a large fundamental change
  • Label as either automation, bug, documentation, enhancement, infrastructure, or performance

Copy link
Contributor

github-actions bot commented Dec 3, 2023

🦙 MegaLinter status: ⚠️ WARNING

Descriptor Linter Files Fixed Errors Elapsed time
✅ BASH bash-exec 5 0 0.06s
✅ BASH shellcheck 5 0 0.12s
✅ BASH shfmt 5 0 0 0.52s
✅ COPYPASTE jscpd yes no 4.23s
✅ DOCKERFILE hadolint 127 0 16.43s
✅ JSON eslint-plugin-jsonc 23 0 0 3.89s
✅ JSON jsonlint 21 0 0.24s
✅ JSON v8r 23 0 18.7s
✅ MAKEFILE checkmake 1 0 0.0s
⚠️ MARKDOWN markdownlint 259 0 11 7.73s
✅ MARKDOWN markdown-link-check 259 0 8.25s
✅ MARKDOWN markdown-table-formatter 259 0 0 54.6s
✅ OPENAPI spectral 1 0 1.66s
⚠️ PYTHON bandit 206 61 3.2s
✅ PYTHON black 206 0 0 4.45s
✅ PYTHON flake8 206 0 2.71s
✅ PYTHON isort 206 0 0 1.4s
✅ PYTHON mypy 206 0 14.59s
✅ PYTHON pylint 206 0 17.24s
⚠️ PYTHON pyright 206 346 25.03s
✅ PYTHON ruff 206 0 0 0.69s
✅ REPOSITORY checkov yes no 40.01s
✅ REPOSITORY git_diff yes no 0.5s
⚠️ REPOSITORY grype yes 1 25.44s
✅ REPOSITORY secretlint yes no 12.69s
✅ REPOSITORY trivy yes no 38.81s
✅ REPOSITORY trivy-sbom yes no 15.25s
⚠️ REPOSITORY trufflehog yes 1 19.16s
✅ SPELL cspell 679 0 30.84s
✅ SPELL lychee 339 0 75.68s
✅ XML xmllint 3 0 0 0.55s
✅ YAML prettier 160 0 0 7.78s
✅ YAML v8r 102 0 157.66s
✅ YAML yamllint 161 0 1.93s

See detailed report in MegaLinter reports

MegaLinter is graciously provided by OX Security

@echoix
Copy link
Collaborator Author

echoix commented Dec 6, 2023

I want to keep only the first commit, remove the build changes, and rebase from main

@nvuillam
Copy link
Member

nvuillam commented Dec 6, 2023

I want to keep only the first commit, remove the build changes, and rebase from main

@echoix are you playing with AI ? 👼

@echoix
Copy link
Collaborator Author

echoix commented Dec 6, 2023

No, I just don't know how, I tried the other day once the CI was unblocked, but there was so many conflicts and just gave up for the time that I had

Copy link
Member

@nvuillam nvuillam left a comment

Choose a reason for hiding this comment

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

I merged by branch is yours, let's see if it solves the CI :)

@echoix
Copy link
Collaborator Author

echoix commented Dec 9, 2023

Does it need to trigger a new build.sh?

@nvuillam
Copy link
Member

nvuillam commented Dec 9, 2023

Does it need to trigger a new build.sh?

I did one locally in your branch, the result was the same :)

@nvuillam nvuillam merged commit 84e465b into main Dec 9, 2023
130 checks passed
@nvuillam nvuillam deleted the remove-openssl-default-package branch December 9, 2023 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants