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.

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

Upgrade Python in Dockerfiles to pick up security fixes #51226

Closed
wants to merge 1 commit into from
Closed

Upgrade Python in Dockerfiles to pick up security fixes #51226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-sentry/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ inputs:
python-version:
description: 'python version to install'
required: false
default: '3.8.16'
default: '3.8.17'
Copy link
Member

Choose a reason for hiding this comment

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

this version has known breakages for sentry-sdk so we can't do this quite yet -- getsentry/sentry-python#2160 (comment)

Copy link
Member

Choose a reason for hiding this comment

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

The breakage on the SDK side means we can't upgrade on the server side?

Also, I'm seeing a fix for the SDK shipped in 1.25.1. Not enough?

Copy link
Member

Choose a reason for hiding this comment

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

(1) yes, we use our own sdk
(2) correct, we are not on that version

Copy link
Member

Choose a reason for hiding this comment

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

Would it make sense to upgrade the SDK version on this PR?

Copy link
Member

Choose a reason for hiding this comment

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

no, those should be two separate PRs of two distinct actions rather than coupling two unrelated changes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

should i create the Pr for sentry SDK version upgrade.

pg-version:
description: 'PostgreSQL version to use'
default: '14'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ jobs:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- uses: getsentry/action-setup-venv@9e3bbae3836b1b6f129955bf55a19e1d99a61c67 # v1.0.5
with:
python-version: 3.8.16
python-version: 3.8.17
cache-depedency: requirements-dev-frozen.txt
install-cmd: pip install -q --constraint requirements-dev-frozen.txt pip-tools
- name: check requirements
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:

- uses: getsentry/action-setup-venv@9e3bbae3836b1b6f129955bf55a19e1d99a61c67 # v1.0.5
with:
python-version: 3.8.16
python-version: 3.8.17
cache-dependency-path: |
requirements-dev.txt
requirements-dev-frozen.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/development-environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
# This handles Python's cache
- uses: getsentry/action-setup-venv@9e3bbae3836b1b6f129955bf55a19e1d99a61c67 # v1.0.5
with:
python-version: 3.8.16
python-version: 3.8.17
cache-dependency-path: requirements-dev-frozen.txt

# This tests starting up the dev services, loading mocks and pre-commit installation
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- uses: getsentry/action-setup-venv@9e3bbae3836b1b6f129955bf55a19e1d99a61c67 # v1.0.5
with:
python-version: 3.8.16
python-version: 3.8.17
cache-dependency-path: |
requirements-dev.txt
requirements-dev-frozen.txt
Expand Down
2 changes: 1 addition & 1 deletion .python-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.8.16
3.8.17
2 changes: 1 addition & 1 deletion self-hosted/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8.16-slim-bullseye
FROM python:3.8.17-slim-bullseye

LABEL maintainer="oss@sentry.io"
LABEL org.opencontainers.image.title="Sentry"
Expand Down
2 changes: 1 addition & 1 deletion self-hosted/builder.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8.16-slim-buster as sdist
FROM python:3.8.17-slim-buster as sdist

LABEL maintainer="oss@sentry.io"
LABEL org.opencontainers.image.title="Sentry Wheel Builder"
Expand Down