Skip to content

Commit

Permalink
Merge pull request #1930 from yuvipanda/bump-dock
Browse files Browse the repository at this point in the history 
Bump base image versions used
  • Loading branch information
@yuvipanda
yuvipanda authored Feb 13, 2025
2 parents e9a8f06 + 3883aac commit 1da3d9a
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 41 deletions.
2 changes: 1 addition & 1 deletion ci/refreeze
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ docker run --rm \
--volume="$PWD:/io" \
--workdir=/io \
--user=root \
python:3.11-bullseye \
python:3.13-bookworm \
sh -c 'pip install pip-tools==7.* && pip-compile --allow-unsafe --strip-extras --upgrade helm-chart/images/binderhub/requirements.in'
4 changes: 2 additions & 2 deletions helm-chart/images/binderhub/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
# NOTE: If the image version is updated, also update it in ci/refreeze!
#
FROM python:3.11-bullseye as build-stage
FROM python:3.13-bookworm as build-stage

# Build wheels
#
Expand All @@ -34,7 +34,7 @@ RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
# ---------------
# This stage is built and published as quay.io/jupyterhub/k8s-binderhub.
#
FROM python:3.11-slim-bullseye
FROM python:3.13-slim-bookworm

ENV PYTHONUNBUFFERED=1
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
74 changes: 36 additions & 38 deletions helm-chart/images/binderhub/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.13
# by the following command:
#
# Use the "Run workflow" button at https://github.com/jupyterhub/binderhub/actions/workflows/watch-dependencies.yaml
#
alembic==1.14.0
alembic==1.14.1
# via jupyterhub
async-generator==1.10
# via jupyterhub
attrs==24.3.0
attrs==25.1.0
# via
# jsonschema
# referencing
cachetools==5.5.0
cachetools==5.5.1
# via google-auth
certifi==2024.12.14
certifi==2025.1.31
# via
# kubernetes
# requests
Expand All @@ -26,33 +26,33 @@ charset-normalizer==3.4.1
# via requests
cryptography==44.0.1
# via certipy
deprecated==1.2.15
deprecated==1.2.18
# via opentelemetry-api
docker==7.1.0
# via -r ../../../requirements.txt
# via -r /io/requirements.txt
escapism==1.0.1
# via -r ../../../requirements.txt
google-api-core[grpc]==2.24.0
# via -r /io/requirements.txt
google-api-core==2.24.1
# via
# google-cloud-appengine-logging
# google-cloud-core
# google-cloud-logging
google-auth==2.37.0
google-auth==2.38.0
# via
# google-api-core
# google-cloud-appengine-logging
# google-cloud-core
# google-cloud-logging
# kubernetes
google-cloud-appengine-logging==1.5.0
google-cloud-appengine-logging==1.6.0
# via google-cloud-logging
google-cloud-audit-log==0.3.0
# via google-cloud-logging
google-cloud-core==2.4.1
# via google-cloud-logging
google-cloud-logging==3.11.3
# via -r requirements.in
googleapis-common-protos[grpc]==1.66.0
google-cloud-logging==3.11.4
# via -r helm-chart/images/binderhub/requirements.in
googleapis-common-protos==1.67.0
# via
# google-api-core
# google-cloud-audit-log
Expand All @@ -62,39 +62,39 @@ greenlet==3.1.1
# via sqlalchemy
grpc-google-iam-v1==0.14.0
# via google-cloud-logging
grpcio==1.69.0
grpcio==1.70.0
# via
# google-api-core
# googleapis-common-protos
# grpc-google-iam-v1
# grpcio-status
grpcio-status==1.69.0
grpcio-status==1.70.0
# via google-api-core
idna==3.10
# via requests
importlib-metadata==8.5.0
# via opentelemetry-api
jinja2==3.1.5
# via
# -r ../../../requirements.txt
# -r /io/requirements.txt
# jupyterhub
jsonschema==4.23.0
# via
# -r ../../../requirements.txt
# -r /io/requirements.txt
# jupyter-telemetry
jsonschema-specifications==2024.10.1
# via jsonschema
jupyter-telemetry==0.1.0
# via jupyterhub
jupyterhub==4.1.6
# via
# -r ../../../requirements.txt
# -r requirements.in
# -r /io/requirements.txt
# -r helm-chart/images/binderhub/requirements.in
kubernetes==9.0.1
# via
# -r ../../../requirements.txt
# -r requirements.in
mako==1.3.8
# -r /io/requirements.txt
# -r helm-chart/images/binderhub/requirements.in
mako==1.3.9
# via alembic
markupsafe==3.0.2
# via
Expand All @@ -104,22 +104,22 @@ oauthlib==3.2.2
# via
# jupyterhub
# requests-oauthlib
opentelemetry-api==1.29.0
opentelemetry-api==1.30.0
# via google-cloud-logging
packaging==24.2
# via jupyterhub
pamela==1.2.0
# via jupyterhub
prometheus-client==0.21.1
# via
# -r ../../../requirements.txt
# -r /io/requirements.txt
# jupyterhub
proto-plus==1.25.0
proto-plus==1.26.0
# via
# google-api-core
# google-cloud-appengine-logging
# google-cloud-logging
protobuf==5.29.2
protobuf==5.29.3
# via
# google-api-core
# google-cloud-appengine-logging
Expand All @@ -138,20 +138,20 @@ pyasn1-modules==0.4.1
pycparser==2.22
# via cffi
pycurl==7.45.4
# via -r requirements.in
# via -r helm-chart/images/binderhub/requirements.in
pyjwt==2.10.1
# via -r ../../../requirements.txt
# via -r /io/requirements.txt
python-dateutil==2.9.0.post0
# via
# jupyterhub
# kubernetes
python-json-logger==3.2.1
# via
# -r ../../../requirements.txt
# -r /io/requirements.txt
# jupyter-telemetry
pyyaml==6.0.2
# via kubernetes
referencing==0.35.1
referencing==0.36.2
# via
# jsonschema
# jsonschema-specifications
Expand All @@ -172,23 +172,21 @@ rsa==4.9
# via google-auth
ruamel-yaml==0.18.10
# via jupyter-telemetry
ruamel-yaml-clib==0.2.12
# via ruamel-yaml
six==1.17.0
# via
# kubernetes
# python-dateutil
sqlalchemy==2.0.36
sqlalchemy==2.0.38
# via
# alembic
# jupyterhub
tornado==6.4.2
# via
# -r ../../../requirements.txt
# -r /io/requirements.txt
# jupyterhub
traitlets==5.14.3
# via
# -r ../../../requirements.txt
# -r /io/requirements.txt
# jupyter-telemetry
# jupyterhub
typing-extensions==4.12.2
Expand All @@ -202,11 +200,11 @@ urllib3==2.3.0
# requests
websocket-client==1.8.0
# via kubernetes
wrapt==1.17.0
wrapt==1.17.2
# via deprecated
zipp==3.21.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==75.7.0
setuptools==75.8.0
# via kubernetes

0 comments on commit 1da3d9a

Please sign in to comment.