Skip to content

Update docker/distribution to 2.8.0#30462

Merged
ph merged 3 commits intoelastic:mainfrom
ph:docker/update-lib
Feb 22, 2022
Merged

Update docker/distribution to 2.8.0#30462
ph merged 3 commits intoelastic:mainfrom
ph:docker/update-lib

Conversation

@ph
Copy link
Copy Markdown
Contributor

@ph ph commented Feb 17, 2022 •
edited
Loading

Advisory:

Due to an oversight in the OCI Image Specification that removed the embedded mediaType field from
manifests, a maliciously crafted OCI Container Image can cause registry clients to parse
the same image in two different ways without modifying the image’s digest by modifying the
Content-Type header returned by a registry. This can invalidate a common pattern of relying
on container image digests for equivalence.

What does this PR do?

Why is it important?

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@ph ph added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Feb 17, 2022
@ph ph requested a review from a team February 17, 2022 19:09
@ph ph self-assigned this Feb 17, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 17, 2022

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 17, 2022

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Feb 17, 2022
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Feb 17, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b docker/update-lib upstream/docker/update-lib
git merge upstream/main
git push upstream docker/update-lib

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Feb 17, 2022

This pull request does not have a backport label. Could you fix it @ph? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Feb 17, 2022
@ph ph added backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify backport-v8.2.0 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Feb 17, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 17, 2022 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-02-21T16:07:57.288+0000

  • Duration: 207 min 52 sec

Test stats 🧪

Test Results
Failed 0
Passed 38345
Skipped 3320
Total 41665

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

ph added 3 commits February 21, 2022 11:07
@ph
Update docker/distribution to 2.8.0
0ea0d62 
Due to an oversight in the OCI Image Specification that removed the embedded mediaType field from
manifests, a maliciously crafted OCI Container Image can cause registry clients to parse
the same image in two different ways without modifying the image’s digest by modifying the
Content-Type header returned by a registry. This can invalidate a common pattern of relying
on container image digests for equivalence.
@ph
Update changelog
379b9bf
@ph
missing notice and go.sum update
0eb6f62
@ph ph mentioned this pull request Feb 22, 2022
Closed
@ph
Copy link
Copy Markdown
Contributor Author

ph commented Feb 22, 2022

Looking at the e2e test this look like a failure in ansible bootstrap and created elastic/e2e-testing#2164

[2022-02-21T19:44:31.678Z] fatal: [3.19.142.182]: FAILED! => {"msg": "The conditional check 'golang_redis_sha256sum not in (None, '')' failed. The error was: error while evaluating conditional (golang_redis_sha256sum not in (None, '')): 'golang_redis_sha256sum' is undefined"}

@ph ph merged commit d699e19 into elastic:main Feb 22, 2022
@ph ph deleted the docker/update-lib branch February 22, 2022 15:25
mergify bot pushed a commit that referenced this pull request Feb 22, 2022
@ph
Update docker/distribution to 2.8.0 (#30462)
4108afe 
(cherry picked from commit d699e19)

# Conflicts:
#	go.sum
@mergify mergify bot mentioned this pull request Feb 22, 2022
Merged
mergify bot pushed a commit that referenced this pull request Feb 22, 2022
@ph
Update docker/distribution to 2.8.0 (#30462)
08c1f2c 
(cherry picked from commit d699e19)

# Conflicts:
#	go.sum
@mergify mergify bot mentioned this pull request Feb 22, 2022
Merged
mergify bot pushed a commit that referenced this pull request Feb 22, 2022
@ph
Update docker/distribution to 2.8.0 (#30462)
5d36674 
(cherry picked from commit d699e19)
@mergify mergify bot mentioned this pull request Feb 22, 2022
Merged
v1v added a commit to v1v/beats that referenced this pull request Feb 22, 2022
@v1v
Merge remote-tracking branch 'upstream/main' into feature/refactor-pa…
29471a7 
…ckaging-docker

* upstream/main: (26 commits)
  Update docker/distribution to 2.8.0 (elastic#30462)
  Add `parsers` examples to `filestream` reference configuration (elastic#30529)
  extend documentation about setting orchestrator.cluster fields (elastic#30518)
  Forward-port 8.0.1 changelog to main (elastic#30522)
  Switch skip to use `CI` (elastic#30512)
  packetbeat/beater: don't attempt to install npcap when already installed (elastic#30509)
  Fix Docker module: rename fields on dashboards (elastic#30500)
  fix typos and improve sentences (elastic#30432)
  Add drop and explicit tests to avoid duplicate ingest of elasticsearch logs (elastic#30440)
  {,x-pack/}auditbeat: replace uses of github.com/pkg/errors with stdlib equivalents (elastic#30321)
  Spelling fix (elastic#30439)
  packetbeat/beater: make sure Npcap installation runs before interfaces are needed in all cases (elastic#30438)
  Add BC about Homebrew no longer being available in 8.0 (elastic#30419)
  Install gawk as a replacement for mawk in Docker containers. (elastic#30452)
  Clean up python-related system tests (elastic#30415)
  Fix TestNewModuleRegistry flakiness (elastic#30453)
  [Filebeat] [auditd]: Support EXECVE events with truncated argument list (elastic#30382)
  Set `log.offset` to the start of the reported line in filestream (elastic#30445)
  clarify SelectedPackageTypes meaning and improve its usage (elastic#30142)
  [elasticsearch module] serialize shards properties (elastic#30408)
  ...
ph added a commit that referenced this pull request Feb 22, 2022
@mergify @ph
Update docker/distribution to 2.8.0 (#30462) (#30540)
3d157cf 
(cherry picked from commit d699e19)

Co-authored-by: Pier-Hugues Pellerin <phpellerin@gmail.com>
v1v added a commit to v1v/beats that referenced this pull request Feb 22, 2022
@v1v
Merge remote-tracking branch 'upstream/main' into feature/use-with-ki…
12a61e7 
…nd-k8s-env

* upstream/main:
  Update docker/distribution to 2.8.0 (elastic#30462)
  Add `parsers` examples to `filestream` reference configuration (elastic#30529)
  extend documentation about setting orchestrator.cluster fields (elastic#30518)
  Forward-port 8.0.1 changelog to main (elastic#30522)
  Switch skip to use `CI` (elastic#30512)
  packetbeat/beater: don't attempt to install npcap when already installed (elastic#30509)
  Fix Docker module: rename fields on dashboards (elastic#30500)
ph added a commit that referenced this pull request Feb 23, 2022
@mergify @ph
[8.0](backport #30462) Update docker/distribution to 2.8.0 (#30539)
a8e58c9 
* Update docker/distribution to 2.8.0 (#30462)

Co-authored-by: Pier-Hugues Pellerin <phpellerin@gmail.com>
ph added a commit that referenced this pull request Feb 23, 2022
@mergify @ph
[7.17](backport #30462) Update docker/distribution to 2.8.0 (#30538)
c21cafd 
* Update docker/distribution to 2.8.0 (#30462)

(cherry picked from commit d699e19)

Co-authored-by: Pier-Hugues Pellerin <phpellerin@gmail.com>
v1v added a commit that referenced this pull request Mar 2, 2022
@v1v
Merge branch '8.1' of github.com:elastic/beats into mergify/bp/8.1/pr…
0112148 
…-29710

* '8.1' of github.com:elastic/beats: (51 commits)
  refactor pushDockerImages (#30414) (#30624)
  ci: add windows-2022 in the extended meta-stage (#30528) (#30630)
  Curate k8s testing versions to only keep the actively maintained (#30619) (#30625)
  [8.1](backport #30355) Add Beats upgrade docs for 8.0 (#30612)
  Remove references to gcp from the Functionbeat docs (#30579) (#30609)
  x-pack/auditbeat/module/system/socket: defend against exec with zero arguments (#30586) (#30597)
  [MySQL Enterprise] Adding default paths values to manifest.yml (#30598) (#30604)
  metricbeat - fix elasticsearch and kibana integration tests failures in 8.0 (#30566) (#30594)
  Install gawk as a replacement for mawk in Docker containers. (#30452) (#30465)
  [Filebeat] Remove RecordedFuture dataset from Threat Intel module (#30564) (#30568)
  Adjust the documentation of `backoff` options in filestream input (#30552) (#30557)
  packetbeat/beater: help the GC clean up the Npcap installer if it's not used (#30513) (#30546)
  Osquerybeat: Add install verification for osquerybeat (#30388) (#30404)
  Update docker/distribution to 2.8.0 (#30462) (#30540)
  Add `parsers` examples to `filestream` reference configuration (#30529) (#30537)
  [8.1](backport #30068) ZooKeeper module: Adapt to ZooKeeper 3.6+ `mntr` response fields' changes. (#30360)
  [8.1](backport #30512) Switch skip to use `CI` (#30525)
  Forward-port 8.0.1 changelog to 8.1 (#30517)
  packetbeat/beater: don't attempt to install npcap when already installed (#30509) (#30511)
  Add drop and explicit tests to avoid duplicate ingest of elasticsearch logs (#30440) (#30488)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cmacknz cmacknz cmacknz approved these changes

Assignees

@ph ph

Labels

backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify backport-v8.2.0 Automated backport with mergify Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ph @elasticmachine @cmacknz