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

v0.30 updates: openssl, LLVM, and docker build layers #100

Merged
merged 4 commits into from
Mar 6, 2023

Conversation

jpmcb
Copy link
Contributor

@jpmcb jpmcb commented Mar 3, 2023

Issue number:

N/a - related to some build failures and optimizations

Description of changes:

- LLVM: Reverts to 14.0.6
- openssl: Removes 0056-strcasecmp.patch
- Dockerfile: Removes `--squash` for docker build and uses single layer for sdk

Testing done:

Coming soon!

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Signed-off-by: John McBride <jpmmcb@amazon.com>
Resolves duplicate `OPENSSL_strcasecmp` symbols being defined for openssl

Signed-off-by: John McBride <jpmmcb@amazon.com>
… for sdk

Signed-off-by: John McBride <jpmmcb@amazon.com>
Signed-off-by: John McBride <jpmmcb@amazon.com>
@jpmcb
Copy link
Contributor Author

jpmcb commented Mar 4, 2023

A bit more context:

  • LLVM: Users saw some failures using v0.30 and v0.29 of the SDK where some LLVM symbols were missing. Reverting back to 14.0.6 fixed this but we need to investigate further to figure out what's going on here.
  • OpenSSL: Users saw OPENSSL_strcasecmp being defined a second time. This drops that patch that re-defines this
  • Dockerfile / docker build: The --squash flag is not supported with the DOCKERBUILD_KIT=1. So the workaround is to dump the final images into a single layered image at the end.

@jpculp
Copy link
Member

jpculp commented Mar 4, 2023

  • Build SDK x86_64 on x86_64
  • Build SDK aarch64 on x86_64
  • Build SDK aarch64 on aarch64
  • Build SDK x86_64 on aarch64

Going to do some additional testing on Monday.

Copy link
Member

@jpculp jpculp left a comment

Choose a reason for hiding this comment

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

Smoke tests passed for aws-k8s-1.24 (x86_64) and aws-ecs-1 (aarch64).

@jpmcb jpmcb merged commit d8497df into bottlerocket-os:develop Mar 6, 2023
@jpmcb jpmcb deleted the v0.30-updates branch March 6, 2023 21:05
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.

None yet

5 participants