zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1001 from consideRatio/pr/traefik-bump

Browse Source 
Update traefik from 2.10.1 to 3.1.4
This commit is contained in:
Erik Sundell
2024-09-28 10:59:38 +02:00
committed by GitHub
parent 92e317d41f 3ddc1e8d59
commit eb5c0e4758
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tljh/installer.py
View File

@@ -115,7 +115,6 @@ def ensure_jupyterhub_package(prefix):
os.path.join(HERE, "requirements-hub-env.txt"), os.path.join(HERE, "requirements-hub-env.txt"),
upgrade=True, upgrade=True,
) )
traefik.ensure_traefik_binary(prefix)
def ensure_usergroups(): def ensure_usergroups():
@@ -536,6 +535,7 @@ def main():
logger.info("Setting up JupyterHub...") logger.info("Setting up JupyterHub...")
ensure_jupyterhub_package(HUB_ENV_PREFIX) ensure_jupyterhub_package(HUB_ENV_PREFIX)
traefik.ensure_traefik_binary(HUB_ENV_PREFIX)
# Stop the http server with the progress page before traefik starts # Stop the http server with the progress page before traefik starts
if args.progress_page_server_pid: if args.progress_page_server_pid:

11
tljh/traefik.py
View File

@@ -29,13 +29,13 @@ else:
plat = None plat = None
# Traefik releases: https://github.com/traefik/traefik/releases # Traefik releases: https://github.com/traefik/traefik/releases
traefik_version = "2.10.1" traefik_version = "3.1.4"
# record sha256 hashes for supported platforms here # record sha256 hashes for supported platforms here
# checksums are published in the checksums.txt of each release # checksums are published in the checksums.txt of each release
checksums = { checksums = {
"linux_amd64": "8d9bce0e6a5bf40b5399dbb1d5e3e5c57b9f9f04dd56a2dd57cb0713130bc824", "linux_amd64": "eb7227b1b235195355904839c514a9ed6a0aecdcf5dab02ad48db21b05c5e700",
"linux_arm64": "260a574105e44901f8c9c562055936d81fbd9c96a21daaa575502dc69bfe390a", "linux_arm64": "e5d970a7f11267b70a8e308cb80f859bba4f420f24789f7393fdf3f4cd031631",
} }
_tljh_path = Path(__file__).parent.resolve() _tljh_path = Path(__file__).parent.resolve()
@@ -91,7 +91,10 @@ def check_traefik_version(traefik_bin):
@backoff.on_exception(backoff.expo, Exception, max_tries=2, giveup=fatal_error) @backoff.on_exception(backoff.expo, Exception, max_tries=2, giveup=fatal_error)
def ensure_traefik_binary(prefix): def ensure_traefik_binary(prefix):
"""Download and install the traefik binary to a location identified by a prefix path such as '/opt/tljh/hub/'""" """
Ensure that a traefik binary of a hardcoded version is made available at a
prefix path such as '/opt/tljh/hub/'.
"""
if plat is None: if plat is None:
raise OSError( raise OSError(
f"Error. Platform: {os.uname().sysname} / {machine} Not supported." f"Error. Platform: {os.uname().sysname} / {machine} Not supported."