8000 dockerfiles: includes AWS root CA in Windows Dockerfile by pmcenery · Pull Request #6499 · fluent/fluent-bit · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

dockerfiles: includes AWS root CA in Windows Dockerfile #6499

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

Jump to bottom
Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

dockerfiles: includes AWS root CA in Windows Dockerfile #6499

wants to merge 1 commit into from

Conversation

pmcenery
Copy link
@pmcenery pmcenery commented Dec 5, 2022

Install Amazon Root CA cert into runtime image. Fixes #6498

Enter [N/A] in the box, if an item is not applicable to your change.

Testing
Before we can approve your change; please submit the following in a comment:

  • [ N/A ] Example configuration file for the change
  • [ N/A ] Debug log output from testing the change
  • [ N/A ] Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

Documentation

  • [ N/A ] Documentation required for this feature

Backporting

  • [ N/A ] Backport to latest stable release.

Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.

@patrick-stephens
Copy link
Contributor
patrick-stephens commented Dec 5, 2022 •
edited
Loading

@pmcenery can you sort the DCO check out and update the commits to start with dockerfiles: ? The change looks fine but we'll have to rerun the CI once you update anyway and it takes a while so I'd rather not waste the resources.

https://github.com/fluent/fluent-bit/pull/6499/checks?check_run_id=9890497706

DCO
There is one commit incorrectly signed off. This means that the author of this commit failed to include a Signed-off-by line in the commit message.

To avoid having PRs blocked in the future, always include Signed-off-by: Author Name authoremail@example.com in every commit message. You can also do this automatically by using the -s flag (i.e., git commit -s).

Here is how to fix the problem so that this code can be merged.

Rebase the branch
If you have a local git environment and meet the criteria below, one option is to rebase the branch and add your Signed-off-by lines in the new commits. Please note that if others have already begun work based upon the commits in this branch, this solution will rewrite history and may cause serious issues for collaborators (described in the git documentation under "The Perils of Rebasing").

You should only do this if:

You are the only author of the commits in this branch
You are absolutely certain nobody else is doing any work based upon this branch
There are no empty commits in the branch (for example, a DCO Remediation Commit which was added using --allow-empty)
To add your Signed-off-by line to every commit in this branch:

Ensure you have a local copy of your branch by checking out the pull request locally via command line.
In your local branch, run: git rebase HEAD~1 --signoff
Force push your changes to overwrite the branch: git push --force-with-lease origin paulm

@patrick-stephens patrick-stephens changed the title Update Windows Dockerfile dockerfiles: includes AWS root CA in Windows Dockerfile Dec 5, 2022
@pmcenery
Update Windows Dockerfile
52b3f20 
Install Amazon Root CA cert into runtime image.

Signed-off-by: Paul McEnery <pmcenery@gmail.com>
@patrick-stephens patrick-stephens added Windows Bugs and requests about Windows platforms packaging and removed docs-required labels Dec 5, 2022
@pmcenery pmcenery temporarily deployed to pr December 5, 2022 16:00 Inactive
@pmcenery pmcenery temporarily deployed to pr December 5, 2022 16:00 Inactive
@pmcenery pmcenery temporarily deployed to pr December 5, 2022 16:18 Inactive
@PettitWesley
Copy link
Contributor

The AWS Distro has windows support FYI: https://aws.amazon.com/about-aws/whats-new/2022/11/aws-centralized-logging-windows-containers-amazon-ecs-eks/

@patrick-stephens
Copy link
Contributor

@pmcenery please resolve the linting failure - either ignore with justification or correct.

@github-actions
Copy link
Contributor
github-actions bot commented May 2, 2023

This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.

@github-actions github-actions bot added the Stale label May 2, 2023
@github-actions github-actions bot removed the Stale label Aug 16, 2024
@github-actions GitHub Actions
Copy link
Contributor

This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.

@github-actions github-actions bot added the Stale label Nov 27, 2024
@github-actions github-actions bot removed the Stale label Mar 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@niedbalski niedbalski Awaiting requested review from niedbalski niedbalski is a code owner

@patrick-stephens patrick-stephens Awaiting requested review from patrick-stephens patrick-stephens is a code owner

@celalettin1286 celalettin1286 Awaiting requested review from celalettin1286 celalettin1286 is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
packaging Windows Bugs and requests about Windows platforms
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Windows Docker image is missing AWS Root CA Certificate
3 participants
@pmcenery @patrick-stephens @PettitWesley
0