Skip to content

backport security fixes#15

Merged
antoinerg merged 13 commits into5.4-releasefrom
backport-sec-fixes
Apr 18, 2024
Merged

backport security fixes#15
antoinerg merged 13 commits into5.4-releasefrom
backport-sec-fixes

Conversation

@antoinerg
Copy link

@antoinerg antoinerg commented Apr 16, 2024

Closes https://github.com/plotly/dekn/issues/7363 by bringing the changes from #14

A bunch of my earlier PRs were merged upstream but no releases were made 😿

I decided to reuse the images I made for 5.3-sp which were tested to work. This is less error-prone considering this is late.

The only new PR to review in conjunction to this one is plotly/paketo-buildpacks_cpython#8

Components to upgrade:

I built and pushed a new image:

./scripts/package.sh --version 5.4.0b2 --output quay.io/plotly/paketo-buildpacks-python:5.4.0b2
docker push quay.io/plotly/paketo-buildpacks-python:5.4.0b2

@antoinerg antoinerg marked this pull request as ready for review April 16, 2024 20:16
@antoinerg
Copy link
Author

In 5e3c00d, we fixed an additional CVE thanks to a new upstream release!

@antoinerg
Copy link
Author

antoinerg commented Apr 16, 2024

I rebuilt the image with:

./scripts/package.sh --version 5.4.0 --output quay.io/plotly/paketo-buildpacks-python:5.4.0b3
docker push quay.io/plotly/paketo-buildpacks-python:5.4.0b3

Copy link
Member

@BRONSOLO BRONSOLO left a comment

Choose a reason for hiding this comment

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

@antoinerg should this be landing against main with the idea being we'd cut the 5.4 release branch when we freeze off of main?

@antoinerg
Copy link
Author

@antoinerg should this be landing against main with the idea being we'd cut the 5.4 release branch when we freeze off of main?

I initially wanted to do that, but 5.4-release is ahead of main. See main...5.4-release

Unless you have any objection, we'll merge 5.4-release into main once everything is ready.

cc @BRONSOLO

@BRONSOLO
Copy link
Member

Ah, interesting. @tarzzz @antoinerg sorry if this was already discussed by why the early branching for 5.4?

@tarzzz
Copy link

tarzzz commented Apr 17, 2024

@BRONSOLO We exclusively use branches for buildpacks work so that it's easier to sync main with upstream.

There is documentation somewhere (i cant find) but the process to sync with upstream is:

  1. Create a release branch from older release (5.3-release -> 5.4-release).
  2. Sync main from upstream
  3. Merge main onto release branch so that release branch has all the latest changes. For merge conflicts, be prefer our code over the upstream (because that has our custom fixes).

Hope that's helpful.

@antoinerg
Copy link
Author

I think this one is ready for another round of review!

See https://github.com/plotly/dek-deployment/pull/3963 for test details!

@antoinerg antoinerg merged commit 3e2db91 into 5.4-release Apr 18, 2024
@antoinerg antoinerg deleted the backport-sec-fixes branch April 18, 2024 17:23
agateaux pushed a commit that referenced this pull request May 31, 2024
* use newer cypthon build

from PR plotly/paketo-buildpacks_cpython#8

* upgrade poetry-install@5.3-sp

* upgrade poetry

* upgrade pipenv-install

* upgrade pip

* upgrade pip-install

* upgarde miniconda

* upgrade conda-env-update

* fixup pipenv

* update version numbers

* upgarde poetry-run to 0.4.22

* upgrade python-start

* change buildpack versiont to `5.4.0`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants