Skip to content

Commit 1da3d9a

Browse files
authored
Merge pull request #1930 from yuvipanda/bump-dock
Bump base image versions used
2 parents e9a8f06 + 3883aac commit 1da3d9a

File tree

3 files changed

+39
-41
lines changed

3 files changed

+39
-41
lines changed

ci/refreeze

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ docker run --rm \
1010
--volume="$PWD:/io" \
1111
--workdir=/io \
1212
--user=root \
13-
python:3.11-bullseye \
13+
python:3.13-bookworm \
1414
sh -c 'pip install pip-tools==7.* && pip-compile --allow-unsafe --strip-extras --upgrade helm-chart/images/binderhub/requirements.in'

helm-chart/images/binderhub/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
# NOTE: If the image version is updated, also update it in ci/refreeze!
1010
#
11-
FROM python:3.11-bullseye as build-stage
11+
FROM python:3.13-bookworm as build-stage
1212

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

3939
ENV PYTHONUNBUFFERED=1
4040
ENV DEBIAN_FRONTEND=noninteractive
Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.13
33
# by the following command:
44
#
55
# Use the "Run workflow" button at https://github.com/jupyterhub/binderhub/actions/workflows/watch-dependencies.yaml
66
#
7-
alembic==1.14.0
7+
alembic==1.14.1
88
# via jupyterhub
99
async-generator==1.10
1010
# via jupyterhub
11-
attrs==24.3.0
11+
attrs==25.1.0
1212
# via
1313
# jsonschema
1414
# referencing
15-
cachetools==5.5.0
15+
cachetools==5.5.1
1616
# via google-auth
17-
certifi==2024.12.14
17+
certifi==2025.1.31
1818
# via
1919
# kubernetes
2020
# requests
@@ -26,33 +26,33 @@ charset-normalizer==3.4.1
2626
# via requests
2727
cryptography==44.0.1
2828
# via certipy
29-
deprecated==1.2.15
29+
deprecated==1.2.18
3030
# via opentelemetry-api
3131
docker==7.1.0
32-
# via -r ../../../requirements.txt
32+
# via -r /io/requirements.txt
3333
escapism==1.0.1
34-
# via -r ../../../requirements.txt
35-
google-api-core[grpc]==2.24.0
34+
# via -r /io/requirements.txt
35+
google-api-core==2.24.1
3636
# via
3737
# google-cloud-appengine-logging
3838
# google-cloud-core
3939
# google-cloud-logging
40-
google-auth==2.37.0
40+
google-auth==2.38.0
4141
# via
4242
# google-api-core
4343
# google-cloud-appengine-logging
4444
# google-cloud-core
4545
# google-cloud-logging
4646
# kubernetes
47-
google-cloud-appengine-logging==1.5.0
47+
google-cloud-appengine-logging==1.6.0
4848
# via google-cloud-logging
4949
google-cloud-audit-log==0.3.0
5050
# via google-cloud-logging
5151
google-cloud-core==2.4.1
5252
# via google-cloud-logging
53-
google-cloud-logging==3.11.3
54-
# via -r requirements.in
55-
googleapis-common-protos[grpc]==1.66.0
53+
google-cloud-logging==3.11.4
54+
# via -r helm-chart/images/binderhub/requirements.in
55+
googleapis-common-protos==1.67.0
5656
# via
5757
# google-api-core
5858
# google-cloud-audit-log
@@ -62,39 +62,39 @@ greenlet==3.1.1
6262
# via sqlalchemy
6363
grpc-google-iam-v1==0.14.0
6464
# via google-cloud-logging
65-
grpcio==1.69.0
65+
grpcio==1.70.0
6666
# via
6767
# google-api-core
6868
# googleapis-common-protos
6969
# grpc-google-iam-v1
7070
# grpcio-status
71-
grpcio-status==1.69.0
71+
grpcio-status==1.70.0
7272
# via google-api-core
7373
idna==3.10
7474
# via requests
7575
importlib-metadata==8.5.0
7676
# via opentelemetry-api
7777
jinja2==3.1.5
7878
# via
79-
# -r ../../../requirements.txt
79+
# -r /io/requirements.txt
8080
# jupyterhub
8181
jsonschema==4.23.0
8282
# via
83-
# -r ../../../requirements.txt
83+
# -r /io/requirements.txt
8484
# jupyter-telemetry
8585
jsonschema-specifications==2024.10.1
8686
# via jsonschema
8787
jupyter-telemetry==0.1.0
8888
# via jupyterhub
8989
jupyterhub==4.1.6
9090
# via
91-
# -r ../../../requirements.txt
92-
# -r requirements.in
91+
# -r /io/requirements.txt
92+
# -r helm-chart/images/binderhub/requirements.in
9393
kubernetes==9.0.1
9494
# via
95-
# -r ../../../requirements.txt
96-
# -r requirements.in
97-
mako==1.3.8
95+
# -r /io/requirements.txt
96+
# -r helm-chart/images/binderhub/requirements.in
97+
mako==1.3.9
9898
# via alembic
9999
markupsafe==3.0.2
100100
# via
@@ -104,22 +104,22 @@ oauthlib==3.2.2
104104
# via
105105
# jupyterhub
106106
# requests-oauthlib
107-
opentelemetry-api==1.29.0
107+
opentelemetry-api==1.30.0
108108
# via google-cloud-logging
109109
packaging==24.2
110110
# via jupyterhub
111111
pamela==1.2.0
112112
# via jupyterhub
113113
prometheus-client==0.21.1
114114
# via
115-
# -r ../../../requirements.txt
115+
# -r /io/requirements.txt
116116
# jupyterhub
117-
proto-plus==1.25.0
117+
proto-plus==1.26.0
118118
# via
119119
# google-api-core
120120
# google-cloud-appengine-logging
121121
# google-cloud-logging
122-
protobuf==5.29.2
122+
protobuf==5.29.3
123123
# via
124124
# google-api-core
125125
# google-cloud-appengine-logging
@@ -138,20 +138,20 @@ pyasn1-modules==0.4.1
138138
pycparser==2.22
139139
# via cffi
140140
pycurl==7.45.4
141-
# via -r requirements.in
141+
# via -r helm-chart/images/binderhub/requirements.in
142142
pyjwt==2.10.1
143-
# via -r ../../../requirements.txt
143+
# via -r /io/requirements.txt
144144
python-dateutil==2.9.0.post0
145145
# via
146146
# jupyterhub
147147
# kubernetes
148148
python-json-logger==3.2.1
149149
# via
150-
# -r ../../../requirements.txt
150+
# -r /io/requirements.txt
151151
# jupyter-telemetry
152152
pyyaml==6.0.2
153153
# via kubernetes
154-
referencing==0.35.1
154+
referencing==0.36.2
155155
# via
156156
# jsonschema
157157
# jsonschema-specifications
@@ -172,23 +172,21 @@ rsa==4.9
172172
# via google-auth
173173
ruamel-yaml==0.18.10
174174
# via jupyter-telemetry
175-
ruamel-yaml-clib==0.2.12
176-
# via ruamel-yaml
177175
six==1.17.0
178176
# via
179177
# kubernetes
180178
# python-dateutil
181-
sqlalchemy==2.0.36
179+
sqlalchemy==2.0.38
182180
# via
183181
# alembic
184182
# jupyterhub
185183
tornado==6.4.2
186184
# via
187-
# -r ../../../requirements.txt
185+
# -r /io/requirements.txt
188186
# jupyterhub
189187
traitlets==5.14.3
190188
# via
191-
# -r ../../../requirements.txt
189+
# -r /io/requirements.txt
192190
# jupyter-telemetry
193191
# jupyterhub
194192
typing-extensions==4.12.2
@@ -202,11 +200,11 @@ urllib3==2.3.0
202200
# requests
203201
websocket-client==1.8.0
204202
# via kubernetes
205-
wrapt==1.17.0
203+
wrapt==1.17.2
206204
# via deprecated
207205
zipp==3.21.0
208206
# via importlib-metadata
209207

210208
# The following packages are considered to be unsafe in a requirements file:
211-
setuptools==75.7.0
209+
setuptools==75.8.0
212210
# via kubernetes

0 commit comments

Comments
 (0)