Skip to content

Commit eb5c0e4

Browse files
authored
Merge pull request #1001 from consideRatio/pr/traefik-bump
Update traefik from 2.10.1 to 3.1.4
2 parents 92e317d + 3ddc1e8 commit eb5c0e4

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

tljh/installer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ def ensure_jupyterhub_package(prefix):
115115
os.path.join(HERE, "requirements-hub-env.txt"),
116116
upgrade=True,
117117
)
118-
traefik.ensure_traefik_binary(prefix)
119118

120119

121120
def ensure_usergroups():
@@ -536,6 +535,7 @@ def main():
536535

537536
logger.info("Setting up JupyterHub...")
538537
ensure_jupyterhub_package(HUB_ENV_PREFIX)
538+
traefik.ensure_traefik_binary(HUB_ENV_PREFIX)
539539

540540
# Stop the http server with the progress page before traefik starts
541541
if args.progress_page_server_pid:

tljh/traefik.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
plat = None
3030

3131
# Traefik releases: https://github.com/traefik/traefik/releases
32-
traefik_version = "2.10.1"
32+
traefik_version = "3.1.4"
3333

3434
# record sha256 hashes for supported platforms here
3535
# checksums are published in the checksums.txt of each release
3636
checksums = {
37-
"linux_amd64": "8d9bce0e6a5bf40b5399dbb1d5e3e5c57b9f9f04dd56a2dd57cb0713130bc824",
38-
"linux_arm64": "260a574105e44901f8c9c562055936d81fbd9c96a21daaa575502dc69bfe390a",
37+
"linux_amd64": "eb7227b1b235195355904839c514a9ed6a0aecdcf5dab02ad48db21b05c5e700",
38+
"linux_arm64": "e5d970a7f11267b70a8e308cb80f859bba4f420f24789f7393fdf3f4cd031631",
3939
}
4040

4141
_tljh_path = Path(__file__).parent.resolve()
@@ -91,7 +91,10 @@ def check_traefik_version(traefik_bin):
9191

9292
@backoff.on_exception(backoff.expo, Exception, max_tries=2, giveup=fatal_error)
9393
def ensure_traefik_binary(prefix):
94-
"""Download and install the traefik binary to a location identified by a prefix path such as '/opt/tljh/hub/'"""
94+
"""
95+
Ensure that a traefik binary of a hardcoded version is made available at a
96+
prefix path such as '/opt/tljh/hub/'.
97+
"""
9598
if plat is None:
9699
raise OSError(
97100
f"Error. Platform: {os.uname().sysname} / {machine} Not supported."

0 commit comments

Comments
 (0)