From 01b0980660d031ed2c124c206c704107298ad775 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Mar 2025 12:53:02 +0000 Subject: [PATCH 01/18] Bump python from 3.12.8-slim-bookworm to 3.12.9-slim-bookworm Bumps python from 3.12.8-slim-bookworm to 3.12.9-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index df079b9ae8..cde1b77d83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ############################################################ # User guide build environment -FROM python:3.12.8-slim-bookworm AS user_guide_builder +FROM python:3.12.9-slim-bookworm AS user_guide_builder ENV PYTHONDONTWRITEBYTECODE=1 ENV PYTHONUNBUFFERED=1 From 0a0a607f5de0ea7d0bd11da96535cdbbffb5bb66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 12:41:00 +0000 Subject: [PATCH 02/18] Bump node from 20.18.1-bookworm-slim to 20.19.0-bookworm-slim Bumps node from 20.18.1-bookworm-slim to 20.19.0-bookworm-slim. --- updated-dependencies: - dependency-name: node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index df079b9ae8..e78f12fd8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ COPY docs/user_guide docs/user_guide RUN tox -e user-guide # Frontend build environment. -FROM node:20.18.1-bookworm-slim AS frontend_builder +FROM node:20.19.0-bookworm-slim AS frontend_builder WORKDIR /app # Install app dependencies. From cae05594d2e80e0a8162518df0b3031c133cdf0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 12:49:23 +0000 Subject: [PATCH 03/18] Bump dotnet/aspnet from 8.0.13-jammy to 8.0.14-jammy in /Backend Bumps dotnet/aspnet from 8.0.13-jammy to 8.0.14-jammy. --- updated-dependencies: - dependency-name: dotnet/aspnet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Backend/Dockerfile b/Backend/Dockerfile index 45ea726253..55282e746d 100644 --- a/Backend/Dockerfile +++ b/Backend/Dockerfile @@ -19,7 +19,7 @@ COPY . ./ RUN dotnet publish -c Release -o build # Build runtime image. -FROM mcr.microsoft.com/dotnet/aspnet:8.0.13-jammy +FROM mcr.microsoft.com/dotnet/aspnet:8.0.14-jammy ENV ASPNETCORE_URLS=http://+:5000 ENV COMBINE_IS_IN_CONTAINER=1 From 3dd5754c0ddfdfaf2fce00240e7cfb9ba251efb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 12:49:26 +0000 Subject: [PATCH 04/18] Bump dotnet/sdk from 8.0.406-jammy to 8.0.407-jammy in /Backend Bumps dotnet/sdk from 8.0.406-jammy to 8.0.407-jammy. --- updated-dependencies: - dependency-name: dotnet/sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Backend/Dockerfile b/Backend/Dockerfile index 45ea726253..566ca5acb9 100644 --- a/Backend/Dockerfile +++ b/Backend/Dockerfile @@ -7,7 +7,7 @@ ############################################################ # Docker multi-stage build -FROM mcr.microsoft.com/dotnet/sdk:8.0.406-jammy AS builder +FROM mcr.microsoft.com/dotnet/sdk:8.0.407-jammy AS builder WORKDIR /app # Copy csproj and restore (fetch dependencies) as distinct layers. From acbfecfc883d0064116895e59c001b4d627bb0d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 12:54:49 +0000 Subject: [PATCH 05/18] Bump mongo from 7.0.16-jammy to 7.0.18-jammy in /database Bumps mongo from 7.0.16-jammy to 7.0.18-jammy. --- updated-dependencies: - dependency-name: mongo dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- database/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/Dockerfile b/database/Dockerfile index 03e531c997..0635676768 100644 --- a/database/Dockerfile +++ b/database/Dockerfile @@ -5,7 +5,7 @@ # - Intel/AMD 64-bit # - ARM 64-bit ############################################################ -FROM mongo:7.0.16-jammy +FROM mongo:7.0.18-jammy WORKDIR / From cc9fcb43cbe0b9fcd870d569d7f8c66bd3881264 Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Wed, 2 Apr 2025 15:46:21 -0400 Subject: [PATCH 06/18] Merge remote-tracking branch 'origin/dependabot/docker/deploy/python-3.12.9-slim-bookworm' into docker-deps 2025Q2 --- deploy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index d68591591e..59d099711b 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -5,7 +5,7 @@ # - Intel/AMD 64-bit ############################################################ -FROM python:3.12.8-slim-bookworm +FROM python:3.12.9-slim-bookworm USER root From d04422186cbbdb81f5b0e55f84d9ef0e7b5a4fe9 Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Tue, 8 Apr 2025 11:42:39 -0400 Subject: [PATCH 07/18] Upgrade python deps --- deploy/requirements.txt | 26 ++++++----- dev-requirements.txt | 86 +++++++++++++++++++----------------- maintenance/requirements.txt | 22 ++++----- 3 files changed, 72 insertions(+), 62 deletions(-) diff --git a/deploy/requirements.txt b/deploy/requirements.txt index 157dc73827..aca9cd7c37 100644 --- a/deploy/requirements.txt +++ b/deploy/requirements.txt @@ -4,38 +4,38 @@ # # pip-compile requirements.in # -ansible==11.1.0 +ansible==11.4.0 # via -r requirements.in -ansible-core==2.18.1 +ansible-core==2.18.4 # via ansible -cachetools==5.5.0 +cachetools==5.5.2 # via google-auth -certifi==2024.8.30 +certifi==2025.1.31 # via # kubernetes # requests cffi==1.17.1 # via cryptography -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 # via requests -cryptography==44.0.0 +cryptography==44.0.2 # via # ansible-core # pyopenssl durationpy==0.9 # via kubernetes -google-auth==2.36.0 +google-auth==2.38.0 # via kubernetes idna==3.10 # via requests -jinja2==3.1.4 +jinja2==3.1.6 # via # -r requirements.in # ansible-core # jinja2-base64-filters jinja2-base64-filters==0.1.4 # via -r requirements.in -kubernetes==31.0.0 +kubernetes==32.0.1 # via -r requirements.in markupsafe==3.0.2 # via jinja2 @@ -49,11 +49,11 @@ pyasn1==0.6.1 # via # pyasn1-modules # rsa -pyasn1-modules==0.4.1 +pyasn1-modules==0.4.2 # via google-auth pycparser==2.22 # via cffi -pyopenssl==24.3.0 +pyopenssl==25.0.0 # via -r requirements.in python-dateutil==2.9.0.post0 # via kubernetes @@ -76,7 +76,9 @@ six==1.17.0 # via # kubernetes # python-dateutil -urllib3==2.2.3 +typing-extensions==4.13.1 + # via pyopenssl +urllib3==2.3.0 # via # kubernetes # requests diff --git a/dev-requirements.txt b/dev-requirements.txt index cd29e9f39b..ead8451d58 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -4,21 +4,23 @@ # # pip-compile dev-requirements.in # -attrs==24.2.0 +attrs==25.3.0 # via # flake8-bugbear # flake8-eradicate -babel==2.16.0 +babel==2.17.0 # via mkdocs-material -beautifulsoup4==4.12.3 +backrefs==5.8 + # via mkdocs-material +beautifulsoup4==4.13.3 # via mkdocs-htmlproofer-plugin -black==24.10.0 +black==25.1.0 # via -r dev-requirements.in -cachetools==5.5.0 +cachetools==5.5.2 # via # google-auth # tox -certifi==2024.8.30 +certifi==2025.1.31 # via # kubernetes # requests @@ -26,9 +28,9 @@ cffi==1.17.1 # via cryptography chardet==5.2.0 # via tox -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 # via requests -click==8.1.7 +click==8.1.8 # via # black # mkdocs @@ -39,7 +41,7 @@ colorama==0.4.6 # mkdocs # mkdocs-material # tox -cryptography==44.0.0 +cryptography==44.0.2 # via # pyopenssl # types-pyopenssl @@ -51,11 +53,11 @@ durationpy==0.9 # via kubernetes eradicate==2.3.0 # via flake8-eradicate -filelock==3.16.1 +filelock==3.18.0 # via # tox # virtualenv -flake8==7.1.1 +flake8==7.2.0 # via # -r dev-requirements.in # flake8-broken-line @@ -65,7 +67,7 @@ flake8==7.1.1 # pep8-naming flake8-broken-line==1.0.0 # via -r dev-requirements.in -flake8-bugbear==24.10.31 +flake8-bugbear==24.12.12 # via -r dev-requirements.in flake8-comprehensions==3.16.0 # via -r dev-requirements.in @@ -73,15 +75,15 @@ flake8-eradicate==1.5.0 # via -r dev-requirements.in ghp-import==2.1.0 # via mkdocs -google-auth==2.36.0 +google-auth==2.38.0 # via kubernetes humanfriendly==10.0 # via -r dev-requirements.in idna==3.10 # via requests -isort==5.13.2 +isort==6.0.1 # via -r dev-requirements.in -jinja2==3.1.4 +jinja2==3.1.6 # via # -r dev-requirements.in # jinja2-base64-filters @@ -89,7 +91,7 @@ jinja2==3.1.4 # mkdocs-material jinja2-base64-filters==0.1.4 # via -r dev-requirements.in -kubernetes==31.0.0 +kubernetes==32.0.1 # via -r dev-requirements.in markdown==3.7 # via @@ -116,13 +118,13 @@ mkdocs-get-deps==0.2.0 # via mkdocs mkdocs-htmlproofer-plugin==1.3.0 # via -r dev-requirements.in -mkdocs-material==9.5.47 +mkdocs-material==9.6.11 # via -r dev-requirements.in mkdocs-material-extensions==1.3.1 # via mkdocs-material -mkdocs-static-i18n==1.2.3 +mkdocs-static-i18n==1.3.0 # via -r dev-requirements.in -mypy==1.13.0 +mypy==1.15.0 # via -r dev-requirements.in mypy-extensions==1.0.0 # via @@ -146,7 +148,7 @@ pathspec==0.12.1 # mkdocs pep8-naming==0.14.1 # via -r dev-requirements.in -platformdirs==4.3.6 +platformdirs==4.3.7 # via # black # mkdocs-get-deps @@ -158,23 +160,23 @@ pyasn1==0.6.1 # via # pyasn1-modules # rsa -pyasn1-modules==0.4.1 +pyasn1-modules==0.4.2 # via google-auth -pycodestyle==2.12.1 +pycodestyle==2.13.0 # via flake8 pycparser==2.22 # via cffi -pyflakes==3.2.0 +pyflakes==3.3.2 # via flake8 -pygments==2.18.0 +pygments==2.19.1 # via mkdocs-material -pymdown-extensions==10.12 +pymdown-extensions==10.14.3 # via mkdocs-material -pymongo==4.10.1 +pymongo==4.12.0 # via -r dev-requirements.in -pyopenssl==24.3.0 +pyopenssl==25.0.0 # via -r dev-requirements.in -pyproject-api==1.8.0 +pyproject-api==1.9.0 # via tox pyreadline3==3.5.4 # via @@ -194,8 +196,6 @@ pyyaml==6.0.2 # pyyaml-env-tag pyyaml-env-tag==0.1 # via mkdocs -regex==2024.11.6 - # via mkdocs-material requests==2.32.3 # via # kubernetes @@ -212,30 +212,36 @@ six==1.17.0 # python-dateutil soupsieve==2.6 # via beautifulsoup4 -tox==4.23.2 +tox==4.25.0 # via -r dev-requirements.in -types-cffi==1.16.0.20240331 +types-cffi==1.17.0.20250326 # via types-pyopenssl types-pyopenssl==24.1.0.20240722 # via -r dev-requirements.in -types-python-dateutil==2.9.0.20241003 +types-python-dateutil==2.9.0.20241206 # via -r dev-requirements.in -types-pyyaml==6.0.12.20240917 +types-pyyaml==6.0.12.20250402 # via -r dev-requirements.in -types-requests==2.32.0.20241016 +types-requests==2.32.0.20250328 # via -r dev-requirements.in -types-setuptools==75.6.0.20241126 +types-setuptools==78.1.0.20250329 # via types-cffi -typing-extensions==4.12.2 - # via mypy -urllib3==2.2.3 +typing-extensions==4.13.1 + # via + # beautifulsoup4 + # mypy + # pyopenssl +urllib3==2.3.0 # via # kubernetes # requests # types-requests -virtualenv==20.28.0 +virtualenv==20.30.0 # via tox watchdog==6.0.0 # via mkdocs websocket-client==1.8.0 # via kubernetes + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/maintenance/requirements.txt b/maintenance/requirements.txt index 447197cf64..b82505eccf 100644 --- a/maintenance/requirements.txt +++ b/maintenance/requirements.txt @@ -4,29 +4,29 @@ # # pip-compile requirements.in # -cachetools==5.5.0 +cachetools==5.5.2 # via google-auth -certifi==2024.8.30 +certifi==2025.1.31 # via # kubernetes # requests cffi==1.17.1 # via cryptography -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 # via requests -cryptography==44.0.0 +cryptography==44.0.2 # via pyopenssl dnspython==2.7.0 # via pymongo durationpy==0.9 # via kubernetes -google-auth==2.36.0 +google-auth==2.38.0 # via kubernetes humanfriendly==10.0 # via -r requirements.in idna==3.10 # via requests -kubernetes==31.0.0 +kubernetes==32.0.1 # via -r requirements.in oauthlib==3.2.2 # via @@ -36,13 +36,13 @@ pyasn1==0.6.1 # via # pyasn1-modules # rsa -pyasn1-modules==0.4.1 +pyasn1-modules==0.4.2 # via google-auth pycparser==2.22 # via cffi -pymongo==4.10.1 +pymongo==4.12.0 # via -r requirements.in -pyopenssl==24.3.0 +pyopenssl==25.0.0 # via -r requirements.in pyreadline3==3.5.4 # via humanfriendly @@ -62,7 +62,9 @@ six==1.17.0 # via # kubernetes # python-dateutil -urllib3==2.2.3 +typing-extensions==4.13.1 + # via pyopenssl +urllib3==2.3.0 # via # kubernetes # requests From 563c98a7da393a56be6ea4f39959ec5634ea569d Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Tue, 8 Apr 2025 12:20:19 -0400 Subject: [PATCH 08/18] Bump versions in cluster_config --- deploy/scripts/setup_files/cluster_config.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/deploy/scripts/setup_files/cluster_config.yaml b/deploy/scripts/setup_files/cluster_config.yaml index 267f255e0b..b9abc00e68 100644 --- a/deploy/scripts/setup_files/cluster_config.yaml +++ b/deploy/scripts/setup_files/cluster_config.yaml @@ -44,10 +44,11 @@ cert-manager: name: cert-manager reference: jetstack/cert-manager namespace: cert-manager - version: v1.12.3 + version: v1.17.1 wait: true override: - installCRDs: true + crds: + enabled: true nginx-ingress-controller: repo: @@ -67,7 +68,7 @@ rancher-ui: name: rancher reference: rancher-stable/rancher namespace: cattle-system - version: 2.7.6 + version: 2.10.4 wait: true override: hostname: rancher.thecombine.app From 4b35f84f492cf635bd01cc76898a7e8bb0a4ce4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 May 2025 12:32:54 +0000 Subject: [PATCH 09/18] Bump dotnet/sdk from 8.0.406-jammy to 8.0.408-jammy in /Backend Bumps dotnet/sdk from 8.0.406-jammy to 8.0.408-jammy. --- updated-dependencies: - dependency-name: dotnet/sdk dependency-version: 8.0.408-jammy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Backend/Dockerfile b/Backend/Dockerfile index 45ea726253..28fdbc0894 100644 --- a/Backend/Dockerfile +++ b/Backend/Dockerfile @@ -7,7 +7,7 @@ ############################################################ # Docker multi-stage build -FROM mcr.microsoft.com/dotnet/sdk:8.0.406-jammy AS builder +FROM mcr.microsoft.com/dotnet/sdk:8.0.408-jammy AS builder WORKDIR /app # Copy csproj and restore (fetch dependencies) as distinct layers. From a57b6be69422d81e84997340e6487b9440fb3438 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 May 2025 12:32:58 +0000 Subject: [PATCH 10/18] Bump dotnet/aspnet from 8.0.13-jammy to 8.0.15-jammy in /Backend Bumps dotnet/aspnet from 8.0.13-jammy to 8.0.15-jammy. --- updated-dependencies: - dependency-name: dotnet/aspnet dependency-version: 8.0.15-jammy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Backend/Dockerfile b/Backend/Dockerfile index 45ea726253..4b9101aeb8 100644 --- a/Backend/Dockerfile +++ b/Backend/Dockerfile @@ -19,7 +19,7 @@ COPY . ./ RUN dotnet publish -c Release -o build # Build runtime image. -FROM mcr.microsoft.com/dotnet/aspnet:8.0.13-jammy +FROM mcr.microsoft.com/dotnet/aspnet:8.0.15-jammy ENV ASPNETCORE_URLS=http://+:5000 ENV COMBINE_IS_IN_CONTAINER=1 From 38d8fe4c7d364440532f2e9e28f040085f37dbc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 May 2025 12:37:49 +0000 Subject: [PATCH 11/18] Bump python in /deploy Bumps python from 3.12.8-slim-bookworm to 3.12.10-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-version: 3.12.10-slim-bookworm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- deploy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index d68591591e..95cdc2d5a8 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -5,7 +5,7 @@ # - Intel/AMD 64-bit ############################################################ -FROM python:3.12.8-slim-bookworm +FROM python:3.12.10-slim-bookworm USER root From c2c0466a3052a6aa6ebabf603cb0e1ddad8d4fb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 May 2025 12:48:41 +0000 Subject: [PATCH 12/18] Bump mongo from 7.0.16-jammy to 7.0.20-jammy in /database Bumps mongo from 7.0.16-jammy to 7.0.20-jammy. --- updated-dependencies: - dependency-name: mongo dependency-version: 7.0.20-jammy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- database/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/Dockerfile b/database/Dockerfile index 03e531c997..e116e64cf4 100644 --- a/database/Dockerfile +++ b/database/Dockerfile @@ -5,7 +5,7 @@ # - Intel/AMD 64-bit # - ARM 64-bit ############################################################ -FROM mongo:7.0.16-jammy +FROM mongo:7.0.20-jammy WORKDIR / From 48622cd684301e409c134342864d4d363a59e786 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 May 2025 12:51:23 +0000 Subject: [PATCH 13/18] Bump node from 20.18.1-bookworm-slim to 20.19.1-bookworm-slim Bumps node from 20.18.1-bookworm-slim to 20.19.1-bookworm-slim. --- updated-dependencies: - dependency-name: node dependency-version: 20.19.1-bookworm-slim dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index df079b9ae8..c361e3e852 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ COPY docs/user_guide docs/user_guide RUN tox -e user-guide # Frontend build environment. -FROM node:20.18.1-bookworm-slim AS frontend_builder +FROM node:20.19.1-bookworm-slim AS frontend_builder WORKDIR /app # Install app dependencies. From 23e98e84539ae1de6be21ac42a976befbc93f56f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 May 2025 12:51:30 +0000 Subject: [PATCH 14/18] Bump python from 3.12.8-slim-bookworm to 3.12.10-slim-bookworm Bumps python from 3.12.8-slim-bookworm to 3.12.10-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-version: 3.12.10-slim-bookworm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index df079b9ae8..c2e72f1f91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ############################################################ # User guide build environment -FROM python:3.12.8-slim-bookworm AS user_guide_builder +FROM python:3.12.10-slim-bookworm AS user_guide_builder ENV PYTHONDONTWRITEBYTECODE=1 ENV PYTHONUNBUFFERED=1 From 5ad08b3e22c9be0f45aee1381d5a6875145b1f1b Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Thu, 8 May 2025 15:55:30 -0400 Subject: [PATCH 15/18] Bump nginx from 1.27 to 1.28 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b2e4302b6..ce7f9e2baf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ COPY . ./ RUN npm run build # Production environment. -FROM nginx:1.27 +FROM nginx:1.28 WORKDIR /app From f50a4b9ac3d1428d1d1e609f32fa31dc75714711 Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Thu, 8 May 2025 15:59:12 -0400 Subject: [PATCH 16/18] Upgrade *requirements.txt --- deploy/requirements.txt | 20 +++++++++---------- dev-requirements.txt | 38 ++++++++++++++++++------------------ maintenance/requirements.txt | 16 +++++++-------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/deploy/requirements.txt b/deploy/requirements.txt index aca9cd7c37..e28c7a641b 100644 --- a/deploy/requirements.txt +++ b/deploy/requirements.txt @@ -4,27 +4,27 @@ # # pip-compile requirements.in # -ansible==11.4.0 +ansible==11.5.0 # via -r requirements.in -ansible-core==2.18.4 +ansible-core==2.18.5 # via ansible cachetools==5.5.2 # via google-auth -certifi==2025.1.31 +certifi==2025.4.26 # via # kubernetes # requests cffi==1.17.1 # via cryptography -charset-normalizer==3.4.1 +charset-normalizer==3.4.2 # via requests -cryptography==44.0.2 +cryptography==44.0.3 # via # ansible-core # pyopenssl durationpy==0.9 # via kubernetes -google-auth==2.38.0 +google-auth==2.40.1 # via kubernetes idna==3.10 # via requests @@ -43,7 +43,7 @@ oauthlib==3.2.2 # via # kubernetes # requests-oauthlib -packaging==24.2 +packaging==25.0 # via ansible-core pyasn1==0.6.1 # via @@ -70,15 +70,15 @@ requests-oauthlib==2.0.0 # via kubernetes resolvelib==1.0.1 # via ansible-core -rsa==4.9 +rsa==4.9.1 # via google-auth six==1.17.0 # via # kubernetes # python-dateutil -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via pyopenssl -urllib3==2.3.0 +urllib3==2.4.0 # via # kubernetes # requests diff --git a/dev-requirements.txt b/dev-requirements.txt index ead8451d58..1f5f5623ca 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -12,7 +12,7 @@ babel==2.17.0 # via mkdocs-material backrefs==5.8 # via mkdocs-material -beautifulsoup4==4.13.3 +beautifulsoup4==4.13.4 # via mkdocs-htmlproofer-plugin black==25.1.0 # via -r dev-requirements.in @@ -20,7 +20,7 @@ cachetools==5.5.2 # via # google-auth # tox -certifi==2025.1.31 +certifi==2025.4.26 # via # kubernetes # requests @@ -28,7 +28,7 @@ cffi==1.17.1 # via cryptography chardet==5.2.0 # via tox -charset-normalizer==3.4.1 +charset-normalizer==3.4.2 # via requests click==8.1.8 # via @@ -41,7 +41,7 @@ colorama==0.4.6 # mkdocs # mkdocs-material # tox -cryptography==44.0.2 +cryptography==44.0.3 # via # pyopenssl # types-pyopenssl @@ -75,7 +75,7 @@ flake8-eradicate==1.5.0 # via -r dev-requirements.in ghp-import==2.1.0 # via mkdocs -google-auth==2.38.0 +google-auth==2.40.1 # via kubernetes humanfriendly==10.0 # via -r dev-requirements.in @@ -93,7 +93,7 @@ jinja2-base64-filters==0.1.4 # via -r dev-requirements.in kubernetes==32.0.1 # via -r dev-requirements.in -markdown==3.7 +markdown==3.8 # via # mkdocs # mkdocs-htmlproofer-plugin @@ -118,7 +118,7 @@ mkdocs-get-deps==0.2.0 # via mkdocs mkdocs-htmlproofer-plugin==1.3.0 # via -r dev-requirements.in -mkdocs-material==9.6.11 +mkdocs-material==9.6.12 # via -r dev-requirements.in mkdocs-material-extensions==1.3.1 # via mkdocs-material @@ -126,7 +126,7 @@ mkdocs-static-i18n==1.3.0 # via -r dev-requirements.in mypy==1.15.0 # via -r dev-requirements.in -mypy-extensions==1.0.0 +mypy-extensions==1.1.0 # via # black # mypy @@ -134,7 +134,7 @@ oauthlib==3.2.2 # via # kubernetes # requests-oauthlib -packaging==24.2 +packaging==25.0 # via # black # mkdocs @@ -146,9 +146,9 @@ pathspec==0.12.1 # via # black # mkdocs -pep8-naming==0.14.1 +pep8-naming==0.15.1 # via -r dev-requirements.in -platformdirs==4.3.7 +platformdirs==4.3.8 # via # black # mkdocs-get-deps @@ -170,9 +170,9 @@ pyflakes==3.3.2 # via flake8 pygments==2.19.1 # via mkdocs-material -pymdown-extensions==10.14.3 +pymdown-extensions==10.15 # via mkdocs-material -pymongo==4.12.0 +pymongo==4.12.1 # via -r dev-requirements.in pyopenssl==25.0.0 # via -r dev-requirements.in @@ -204,13 +204,13 @@ requests==2.32.3 # requests-oauthlib requests-oauthlib==2.0.0 # via kubernetes -rsa==4.9 +rsa==4.9.1 # via google-auth six==1.17.0 # via # kubernetes # python-dateutil -soupsieve==2.6 +soupsieve==2.7 # via beautifulsoup4 tox==4.25.0 # via -r dev-requirements.in @@ -224,19 +224,19 @@ types-pyyaml==6.0.12.20250402 # via -r dev-requirements.in types-requests==2.32.0.20250328 # via -r dev-requirements.in -types-setuptools==78.1.0.20250329 +types-setuptools==80.3.0.20250505 # via types-cffi -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via # beautifulsoup4 # mypy # pyopenssl -urllib3==2.3.0 +urllib3==2.4.0 # via # kubernetes # requests # types-requests -virtualenv==20.30.0 +virtualenv==20.31.2 # via tox watchdog==6.0.0 # via mkdocs diff --git a/maintenance/requirements.txt b/maintenance/requirements.txt index b82505eccf..733b421d51 100644 --- a/maintenance/requirements.txt +++ b/maintenance/requirements.txt @@ -6,21 +6,21 @@ # cachetools==5.5.2 # via google-auth -certifi==2025.1.31 +certifi==2025.4.26 # via # kubernetes # requests cffi==1.17.1 # via cryptography -charset-normalizer==3.4.1 +charset-normalizer==3.4.2 # via requests -cryptography==44.0.2 +cryptography==44.0.3 # via pyopenssl dnspython==2.7.0 # via pymongo durationpy==0.9 # via kubernetes -google-auth==2.38.0 +google-auth==2.40.1 # via kubernetes humanfriendly==10.0 # via -r requirements.in @@ -40,7 +40,7 @@ pyasn1-modules==0.4.2 # via google-auth pycparser==2.22 # via cffi -pymongo==4.12.0 +pymongo==4.12.1 # via -r requirements.in pyopenssl==25.0.0 # via -r requirements.in @@ -56,15 +56,15 @@ requests==2.32.3 # requests-oauthlib requests-oauthlib==2.0.0 # via kubernetes -rsa==4.9 +rsa==4.9.1 # via google-auth six==1.17.0 # via # kubernetes # python-dateutil -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via pyopenssl -urllib3==2.3.0 +urllib3==2.4.0 # via # kubernetes # requests From 24119f425467f70d6e93613d50d685b3e439e7cf Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Thu, 15 May 2025 11:03:45 -0400 Subject: [PATCH 17/18] Bump versions --- Backend/Dockerfile | 4 ++-- Dockerfile | 2 +- README.md | 4 ++-- dev-requirements.txt | 24 ++++++++++-------------- maintenance/requirements.txt | 4 +--- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Backend/Dockerfile b/Backend/Dockerfile index fb07c62800..b0f1e96c4d 100644 --- a/Backend/Dockerfile +++ b/Backend/Dockerfile @@ -7,7 +7,7 @@ ############################################################ # Docker multi-stage build -FROM mcr.microsoft.com/dotnet/sdk:8.0.408-jammy AS builder +FROM mcr.microsoft.com/dotnet/sdk:8.0.409-jammy AS builder WORKDIR /app # Copy csproj and restore (fetch dependencies) as distinct layers. @@ -19,7 +19,7 @@ COPY . ./ RUN dotnet publish -c Release -o build # Build runtime image. -FROM mcr.microsoft.com/dotnet/aspnet:8.0.15-jammy +FROM mcr.microsoft.com/dotnet/aspnet:8.0.16-jammy ENV ASPNETCORE_URLS=http://+:5000 ENV COMBINE_IS_IN_CONTAINER=1 diff --git a/Dockerfile b/Dockerfile index ce7f9e2baf..5a750ee35f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ COPY . ./ RUN npm run build # Production environment. -FROM nginx:1.28 +FROM nginx:1.28.0 WORKDIR /app diff --git a/README.md b/README.md index ec5e7fae54..4cf58bb660 100644 --- a/README.md +++ b/README.md @@ -228,8 +228,8 @@ environment. This will be denoted with the `(venv)` prefix on the prompt. With an active virtual environment, install Python development requirements for this project: ```bash -python -m pip install --upgrade pip pip-tools -python -m piptools sync dev-requirements.txt +python -m pip -q install --upgrade pip pip-tools +python -m piptools sync -q dev-requirements.txt ``` The following Python scripts can now be run from the virtual environment. diff --git a/dev-requirements.txt b/dev-requirements.txt index 1f5f5623ca..04640818d2 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -30,15 +30,13 @@ chardet==5.2.0 # via tox charset-normalizer==3.4.2 # via requests -click==8.1.8 +click==8.2.0 # via # black # mkdocs colorama==0.4.6 # via # -r dev-requirements.in - # click - # mkdocs # mkdocs-material # tox cryptography==44.0.3 @@ -118,7 +116,7 @@ mkdocs-get-deps==0.2.0 # via mkdocs mkdocs-htmlproofer-plugin==1.3.0 # via -r dev-requirements.in -mkdocs-material==9.6.12 +mkdocs-material==9.6.14 # via -r dev-requirements.in mkdocs-material-extensions==1.3.1 # via mkdocs-material @@ -154,7 +152,7 @@ platformdirs==4.3.8 # mkdocs-get-deps # tox # virtualenv -pluggy==1.5.0 +pluggy==1.6.0 # via tox pyasn1==0.6.1 # via @@ -172,16 +170,14 @@ pygments==2.19.1 # via mkdocs-material pymdown-extensions==10.15 # via mkdocs-material -pymongo==4.12.1 +pymongo==4.13.0 # via -r dev-requirements.in pyopenssl==25.0.0 # via -r dev-requirements.in -pyproject-api==1.9.0 +pyproject-api==1.9.1 # via tox pyreadline3==3.5.4 - # via - # -r dev-requirements.in - # humanfriendly + # via -r dev-requirements.in python-dateutil==2.9.0.post0 # via # ghp-import @@ -194,7 +190,7 @@ pyyaml==6.0.2 # mkdocs-get-deps # pymdown-extensions # pyyaml-env-tag -pyyaml-env-tag==0.1 +pyyaml-env-tag==1.1 # via mkdocs requests==2.32.3 # via @@ -212,7 +208,7 @@ six==1.17.0 # python-dateutil soupsieve==2.7 # via beautifulsoup4 -tox==4.25.0 +tox==4.26.0 # via -r dev-requirements.in types-cffi==1.17.0.20250326 # via types-pyopenssl @@ -222,9 +218,9 @@ types-python-dateutil==2.9.0.20241206 # via -r dev-requirements.in types-pyyaml==6.0.12.20250402 # via -r dev-requirements.in -types-requests==2.32.0.20250328 +types-requests==2.32.0.20250515 # via -r dev-requirements.in -types-setuptools==80.3.0.20250505 +types-setuptools==80.4.0.20250511 # via types-cffi typing-extensions==4.13.2 # via diff --git a/maintenance/requirements.txt b/maintenance/requirements.txt index 733b421d51..dabfe2a980 100644 --- a/maintenance/requirements.txt +++ b/maintenance/requirements.txt @@ -40,12 +40,10 @@ pyasn1-modules==0.4.2 # via google-auth pycparser==2.22 # via cffi -pymongo==4.12.1 +pymongo==4.13.0 # via -r requirements.in pyopenssl==25.0.0 # via -r requirements.in -pyreadline3==3.5.4 - # via humanfriendly python-dateutil==2.9.0.post0 # via kubernetes pyyaml==6.0.2 From 535b1342251584e4a77c510ecfb690fa47385069 Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Thu, 15 May 2025 15:45:20 -0400 Subject: [PATCH 18/18] Update READMEs --- README.md | 12 ++++++------ installer/README.md | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index c5c7492f44..1dfc8acdea 100644 --- a/README.md +++ b/README.md @@ -619,7 +619,7 @@ Notes for installing _Docker Desktop_ in Linux: Once _Docker Desktop_ has been installed, start it, and set it up as follows: 1. Click the gear icon in the upper right to open the settings dialog; -2. Click on the _Resources_ link on the left-hand side and set the Memory to at least 6 GB (see Note); +2. Click on the _Resources_ link on the left-hand side and set the Memory to at least 8 GB (see Note); 3. Click on the _Kubernetes_ link on the left-hand side; 4. Select _Enable Kubernetes_ and click _Apply & Restart_; 5. Click _Install_ on the dialog that is displayed. @@ -978,13 +978,13 @@ Task: add an existing user to a project Run: ```bash -kubectl exec -it deployment/maintenance -- add_user_to_proj.py --project --user +kubectl -n thecombine exec -it deployment/maintenance -- add_user_to_proj.py --project --user ``` For additional options, run: ```bash -kubectl exec -it deployment/maintenance -- add_user_to_proj.py --help` +kubectl -n thecombine exec -it deployment/maintenance -- add_user_to_proj.py --help ``` #### Backup _TheCombine_ @@ -994,7 +994,7 @@ Task: Backup the CombineDatabase and the Backend files to the Amazon Simple Stor Run: ```bash -kubectl exec -it deployment/maintenance -- combine_backup.py [--verbose] +kubectl -n thecombine exec -it deployment/maintenance -- combine_backup.py [--verbose] ``` Notes: @@ -1012,7 +1012,7 @@ Task: Delete a project Run: ```bash -kubectl exec -it deployment/maintenance -- rm_project.py +kubectl -n thecombine exec -it deployment/maintenance -- rm_project.py ``` You may specify more than one `` to delete multiple projects. @@ -1024,7 +1024,7 @@ Task: Restore the CombineDatabase and the Backend files from a backup stored on Run: ```bash -kubectl exec -it deployment/maintenance -- combine_restore.py [--verbose] [BACKUP_NAME] +kubectl -n thecombine exec -it deployment/maintenance -- combine_restore.py [--verbose] [BACKUP_NAME] ``` Note: diff --git a/installer/README.md b/installer/README.md index 396007a1bd..ac3a13191d 100644 --- a/installer/README.md +++ b/installer/README.md @@ -4,17 +4,17 @@ This README describes how to install _The Combine_ Rapid Word Collection tool on ## Contents - - [System Requirements](#system-requirements) - - [Install _The Combine_](#install-the-combine) - - [Running _The Combine_](#running-the-combine) - - [Advanced Installation Options](#advanced-installation-options) +- [System Requirements](#system-requirements) +- [Install _The Combine_](#install-the-combine) +- [Running _The Combine_](#running-the-combine) +- [Advanced Installation Options](#advanced-installation-options) ## System Requirements _The Combine_ can be installed on a PC that meets the following requirements: - Debian-based Linux Operating system -- 6 GB of memory; +- 8 GB of memory; - WiFi interface that supports creating a WiFi Hotspot; - a wired-ethernet connection to the Internet - User account that can run as `root` with `sudo`. @@ -39,10 +39,10 @@ The installation script has been tested on _Ubuntu 22.04_, _Ubuntu 24.04_, and _ via `apt`. (It's available as a Snap package.) As a result, when the installation script, or a user, updates the list of available software, the process fails. To address this issue, run: - ```console - sudo rm /etc/apt/sources.list.d/skype-stable.list - sudo apt update && sudo apt upgrade -y - ``` + ```console + sudo rm /etc/apt/sources.list.d/skype-stable.list + sudo apt update && sudo apt upgrade -y + ``` 4. Download the installation script from [https://s3.amazonaws.com/software.thecombine.app/combine-installer.run](https://s3.amazonaws.com/software.thecombine.app/combine-installer.run) @@ -76,10 +76,10 @@ The installation script has been tested on _Ubuntu 22.04_, _Ubuntu 24.04_, and _ [The Combine](https://software.sil.org/thecombine/#contact) - When run with no options, ./combine-installer.run will install the current version of _The Combine_. - If the previous installation did not run to completion, it will resume where the previous installation left off. - - If you get the error `Job for k3s.service failed because the control process exited with error code.`, - make sure no other instance of k3s is running. For example, if Docker Desktop is active on the current user, run: + - If you get the error `Job for k3s.service failed because the control process exited with error code.`, make sure no + other instance of k3s is running. For example, if Docker Desktop is active on the current user, run: - ```console + ```console systemctl --user stop docker-desktop systemctl --user disable docker-desktop ```