From 25d1df355d04fc67d32065356240c0515031b035 Mon Sep 17 00:00:00 2001 From: Lucy Bridges Date: Mon, 16 Dec 2024 14:55:46 +0000 Subject: [PATCH 1/3] Remove Python distutils The distutils module has been deprecated for some time and was removed in Python3.12[^1]. A recent update to deadsnakes means that the package is no longer available at all and is breaking the build. This package is no longer required as everything has been moved over to setup tools. [^1]: https://peps.python.org/pep-0632/#migration-advice --- docker/dependencies.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/dependencies.txt b/docker/dependencies.txt index f434a227..634d3f77 100644 --- a/docker/dependencies.txt +++ b/docker/dependencies.txt @@ -2,6 +2,5 @@ git postgresql-client python3.12 -python3.12-distutils python3.12-venv tzdata From a6f991ce5df5dbb2a50926fd9b51b1436e4af86f Mon Sep 17 00:00:00 2001 From: Lucy Bridges Date: Mon, 16 Dec 2024 14:39:05 +0000 Subject: [PATCH 2/3] Remove is_active column from grafana's user view This column has been removed from Job Server's user table, so it needs to be removed from the corresponding view as well. --- grafana/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana/README.md b/grafana/README.md index 134cbe20..033f684f 100644 --- a/grafana/README.md +++ b/grafana/README.md @@ -69,7 +69,7 @@ GRANT CONNECT ON database jobserver TO grafanareader; ```sql GRANT SELECT ON applications_application, applications_cmoprioritylistpage, applications_commercialinvolvementpage, applications_datasetspage, applications_legalbasispage, applications_previousehrexperiencepage, applications_recordleveldatapage, applications_referencespage, applications_researcherregistration, applications_sharingcodepage, applications_shortdatareportpage, applications_sponsordetailspage, applications_studydatapage, applications_studyfundingpage, applications_studyinformationpage, applications_studypurposepage, applications_teamdetailspage, applications_typeofstudypage, interactive_analysisrequest, jobserver_backend, jobserver_backendmembership, jobserver_job, jobserver_jobrequest, jobserver_org, jobserver_orgmembership, jobserver_project, jobserver_projectcollaboration, jobserver_projectmembership, jobserver_publishrequest, jobserver_release, jobserver_releasefile, jobserver_releasefilereview, jobserver_repo, jobserver_report, jobserver_snapshot, jobserver_snapshot_files, jobserver_stats, jobserver_workspace, redirects_redirect TO grafanareader; -CREATE VIEW jobserver_user_grafana AS SELECT id,last_login,username,is_active,date_joined,fullname,created_by_id,login_token_expires_at,pat_expires_at,roles FROM jobserver_user; +CREATE VIEW jobserver_user_grafana AS SELECT id,last_login,username,date_joined,fullname,created_by_id,login_token_expires_at,pat_expires_at,roles FROM jobserver_user; GRANT SELECT ON jobserver_user_grafana TO grafanareader; ``` From 6dc095bb28d34e235b51d98afa2d973bb5944e7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 15:47:25 +0000 Subject: [PATCH 3/3] Bump grafana/grafana-enterprise from `921a690` to `473a26e` in /grafana Bumps grafana/grafana-enterprise from `921a690` to `473a26e`. --- updated-dependencies: - dependency-name: grafana/grafana-enterprise dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- grafana/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana/Dockerfile b/grafana/Dockerfile index 0befe731..d1cfb29d 100644 --- a/grafana/Dockerfile +++ b/grafana/Dockerfile @@ -1,3 +1,3 @@ -FROM grafana/grafana-enterprise:latest@sha256:921a6909631d82d139501385e33449416d1124bdfdf5a790ca72fdbf1fb3a56e +FROM grafana/grafana-enterprise:latest@sha256:473a26e9ed1bef41abf2b8d85d0d810a9006534664d30dee7e92b03c9a9cccb2 USER grafana