Skip to content

Address comments on the "rootless CA certs" patch#572

Merged
gdams merged 1 commit into
adoptium:mainfrom
rassie:ca-certs-rework-fixes
Jul 24, 2024
Merged

Address comments on the "rootless CA certs" patch#572
gdams merged 1 commit into
adoptium:mainfrom
rassie:ca-certs-rework-fixes

Conversation

@rassie

@rassie rassie commented Jun 3, 2024

Copy link
Copy Markdown
Contributor

Address the following problems with #538:

  1. Correct the shell selection for entrypoint, Ubuntu flavours still need explicit bash for variables with dots in their names
  2. Change unhelpful exported variable name (changed from CACERT to JRE_CACERTS_PATH)
  3. Change which to more-POSIX-compatible command -v
  4. More cleanup
  5. Explicitely use TMPDIR when available instead of hard-coded /tmp
  6. Support multi-certificate files (again)
  7. Make output less verbose

Fixes: #612

@rassie

rassie commented Jun 3, 2024

Copy link
Copy Markdown
Contributor Author

Ubuntu flavours are broken, I'm on it.

@karianna karianna requested review from gdams and sxa June 3, 2024 09:18
@karianna

karianna commented Jun 3, 2024

Copy link
Copy Markdown
Contributor

CC @tianon

@tianon

tianon commented Jun 6, 2024

Copy link
Copy Markdown

This is an improvement, yes, thanks ❤️

(definitely like your idea in #573 though, and wonder if, since this rootless functionality hasn't been officially released yet, it could happen sooner and then this is moot?)

@rassie

rassie commented Jun 6, 2024

Copy link
Copy Markdown
Contributor Author

wonder if, since this rootless functionality hasn't been officially released yet, it could happen sooner and then this is moot?

That's my thinking too, but since I'm not involved in and not knowledgeable about the release process and its deadlines, I'm offerring both possibilities. #573 still needs to be implemented, tested, documented and experimented with after all and if "July release" is what I think it is, the timeline is rather tight. "rootless" improves on the current process, which is probably valuable by itself, even if we know how it could be improved further.

@karianna karianna force-pushed the ca-certs-rework-fixes branch from 4db09df to 474b3fe Compare June 10, 2024 01:14
@rassie rassie force-pushed the ca-certs-rework-fixes branch from bd5d0f1 to 6de6f41 Compare June 12, 2024 07:25
@rassie rassie force-pushed the ca-certs-rework-fixes branch from 6de6f41 to 089349e Compare June 26, 2024 09:15
@rassie

rassie commented Jun 26, 2024

Copy link
Copy Markdown
Contributor Author

@karianna Are you aware of anything blocking the review and merge here? I would like to get this in before the July release as QOL improvement.

@karianna

karianna commented Jul 1, 2024

Copy link
Copy Markdown
Contributor

@sxa and/or @gdams up next to review and merge.

@karianna

Copy link
Copy Markdown
Contributor

@rassie Apologies for the rebase requirement but I think our release has created conflict for this PR

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

A block has been put on this Pull Request as this repository is temporarily under a code freeze due to an ongoing release cycle.

If this pull request needs to be merged during the release cycle then please comment /merge and a PMC member will be able to remove the block.

If the code freeze is over you can remove this block by commenting /thaw.

@rassie rassie force-pushed the ca-certs-rework-fixes branch from 089349e to 2ae4198 Compare July 23, 2024 07:54
@rassie

rassie commented Jul 23, 2024

Copy link
Copy Markdown
Contributor Author

@karianna rebase done. I hope we can squeeze this patch into the release. Fingers crossed it will help the pain points not exacerbate them.

@rassie

rassie commented Jul 23, 2024

Copy link
Copy Markdown
Contributor Author

@karianna I believe you need to re-trigger that one failing Windows test, it's just flaky.

@tianon

tianon commented Jul 24, 2024

Copy link
Copy Markdown

Doh, this should've been part of all those recent updates, right?

@rassie

rassie commented Jul 24, 2024

Copy link
Copy Markdown
Contributor Author

Doh, this should've been part of all those recent updates, right?

Probably. I've asked multiple times for a review, but nothing happened. I guess the release happened a couple of days ago and then #612 has been reported, so I thought I'd need to fix that as well.

@gdams

gdams commented Jul 24, 2024

Copy link
Copy Markdown
Member

Doh, this should've been part of all those recent updates, right?

yeah we're working on it, it would appear we've broken some users so I want to get this merged and update the official images soon

@gdams

gdams commented Jul 24, 2024

Copy link
Copy Markdown
Member

@rassie if you can help us resolve #612 in this PR we'll get it merged and kick off a republish

@rassie

rassie commented Jul 24, 2024

Copy link
Copy Markdown
Contributor Author

Hold your horses, this build isn't even green yet :)

@gdams

gdams commented Jul 24, 2024

Copy link
Copy Markdown
Member

Hold your horses, this build isn't even green yet :)

yeah just spotted the failing CI, I'll wait until it's green

Address the following problems with adoptium#538:

1. Correct the shell selection for entrypoint, Ubuntu flavours still need explicit `bash` for variables with dots in
their names
2. Change unhelpful exported variable name (changed from `CACERT` to `JRE_CACERTS_PATH`)
3. Change `which` to more-POSIX-compatible `command -v`
4. More cleanup
5. Explicitely use `TMPDIR` when available instead of hard-coded `/tmp`
6. Support multi-certificate files (again)
7. Make output less verbose
@rassie rassie force-pushed the ca-certs-rework-fixes branch from 5449635 to 7c088a6 Compare July 24, 2024 22:08
@rassie

rassie commented Jul 24, 2024

Copy link
Copy Markdown
Contributor Author

@rassie if you can help us resolve #612 in this PR we'll get it merged and kick off a republish

This is what is happening, the latest push as of right now should become green. Would still appreciate a closer look at the source from you, I'm quite anxious about breaking more stuff, even though I believe that the tests are solid.

@gdams gdams left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM with the latest changes

@gdams

gdams commented Jul 24, 2024

Copy link
Copy Markdown
Member

@rassie if you can help us resolve #612 in this PR we'll get it merged and kick off a republish

This is what is happening, the latest push as of right now should become green. Would still appreciate a closer look at the source from you, I'm quite anxious about breaking more stuff, even though I believe that the tests are solid.

This looks good to me, the tests are solid and the changes all seem as expected.

@gdams

gdams commented Jul 24, 2024

Copy link
Copy Markdown
Member

/merge

@github-actions

Copy link
Copy Markdown
Contributor

Approval to merge during the lockdown cycle

Please can two Adoptium PMC members comment /approve?

@gdams

gdams commented Jul 24, 2024

Copy link
Copy Markdown
Member

/approve

@rassie

rassie commented Jul 24, 2024

Copy link
Copy Markdown
Contributor Author

Thanks!

@smlambert

Copy link
Copy Markdown
Contributor

/approve

@github-actions github-actions Bot dismissed their stale review July 24, 2024 22:15

Thank you @gdams and @smlambert for your approvals, this pull request is now approved to merge during release.

@gdams

gdams commented Jul 24, 2024

Copy link
Copy Markdown
Member

@tianon I'll get this merged and update docker-library/official-images#17249 to include these changes shortly

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.

[Bug]: Importing Ca certificates with USE_SYSTEM_CA_CERTS is slower than it used to be

5 participants