From c81a06e1a478cab0bb479b74aeebae198039291e Mon Sep 17 00:00:00 2001 From: Sarah Mount Date: Wed, 21 Aug 2024 09:49:18 +0100 Subject: [PATCH 1/6] Prefer docker composer to docker-compose on CI To fix failing pipline build --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index 347209d9..c9ac5e80 100755 --- a/script/cibuild +++ b/script/cibuild @@ -1,4 +1,4 @@ #!/bin/bash set -e -docker-compose -f docker-compose.test.yml run --rm test +docker compose -f docker-compose.test.yml run --rm test From a4d923ad3777a5bd5151b74bd7acf01d80a50599 Mon Sep 17 00:00:00 2001 From: Sarah Mount Date: Thu, 22 Aug 2024 13:20:04 +0100 Subject: [PATCH 2/6] Dockerfile uses sudo to install envkey The version of Alpine used as the base image here is pinned and the envkey install script has not changed in three years, so it is difficult to see how this broke. However, without installing the sudo package the sudo command in install.sh cannot run and the Dockerfile cannot be built. To ensure that the final image does not change we also remove the sudo package after running the install script. --- docker/web/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile index e62e05f8..b609557f 100644 --- a/docker/web/Dockerfile +++ b/docker/web/Dockerfile @@ -71,7 +71,9 @@ RUN pip install --no-cache-dir \ FROM base AS app # Install envkey-source -RUN curl -s https://raw.githubusercontent.com/envkey/envkey-source/master/install.sh | bash +RUN set -ex && apk add --no-cache sudo \ + && curl -s https://raw.githubusercontent.com/envkey/envkey-source/master/install.sh | bash \ + && apk del sudo # Install and set up Poetry for python dependencies management ENV POETRY_VIRTUALENVS_CREATE=0 \ From aba8284268ccf68be9ac1163ca8d479292059052 Mon Sep 17 00:00:00 2001 From: Sarah Mount Date: Thu, 22 Aug 2024 13:39:55 +0100 Subject: [PATCH 3/6] Install poetry more defensively Avoid errors when building the Dockerfile by: * Creating directories and files that 'poetry install' expects * Adding poetry to the current $PATH --- docker/web/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile index b609557f..e8a88c1a 100644 --- a/docker/web/Dockerfile +++ b/docker/web/Dockerfile @@ -127,8 +127,10 @@ COPY ./app/pyproject.toml /usr/srv/app/pyproject.toml COPY ./app/poetry.lock /usr/srv/app/poetry.lock ## self update disabled currently due to causing timeout issues in the deploy #RUN $HOME/.local/bin/poetry self update 1.2.2 && \ -RUN $HOME/.local/bin/poetry install - +RUN mkdir -p $HOME/.poetry \ + && touch $HOME/.poetry/env \ + && $HOME/.local/bin/poetry install \ + && ln -s $HOME/.local/bin/poetry /usr/local/bin/poetry VOLUME /usr/srv/app/media From 3eb32c343a65a71da0ea4c376fb4afeb630c61cd Mon Sep 17 00:00:00 2001 From: Sarah Mount Date: Thu, 22 Aug 2024 13:54:24 +0100 Subject: [PATCH 4/6] Remove deprecated 'version' from docker-compose --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3c1995d6..9d4d05ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.7' - services: # Postgres db: From 022a6f883f7a6a3b6931d367ec3c5dda3f7e35db Mon Sep 17 00:00:00 2001 From: Sarah Mount Date: Wed, 21 Aug 2024 09:46:30 +0100 Subject: [PATCH 5/6] Change wording of reviewed guidance notice See: https://dxw.zendesk.com/agent/tickets/20058 --- app/templates/ig_guidance/internal_guidance.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/ig_guidance/internal_guidance.html b/app/templates/ig_guidance/internal_guidance.html index 6daec00b..464ff882 100644 --- a/app/templates/ig_guidance/internal_guidance.html +++ b/app/templates/ig_guidance/internal_guidance.html @@ -13,8 +13,8 @@ {% block content %}
-

This guidance has been reviewed by the Health and Care Information Governance Panel, including the Information Commissioner’s Office (ICO) and National Data Guardian (NDG).

-

The panel exists to simplify information governance guidance. Have we done a good job? Let us know at england.igpolicyteam@nhs.net.

+

This guidance has been reviewed by the Health and Care Information Governance Working Group, including the Information Commissioner's Office (ICO) and National Data Guardian (NDG).

+

Have we done a good job? Let us know.

From 4f291cc5f5c661c18bb0099cb6ac36c7b1c951ae Mon Sep 17 00:00:00 2001 From: Sarah Mount Date: Fri, 23 Aug 2024 15:48:06 +0100 Subject: [PATCH 6/6] Add site redirects See: https://dxw.zendesk.com/agent/tickets/20062 --- app/config/urls.py | 176 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/app/config/urls.py b/app/config/urls.py index 662af05d..ece34cac 100644 --- a/app/config/urls.py +++ b/app/config/urls.py @@ -118,6 +118,182 @@ def robots(request): permanent=True, ), ), + # https://dxw.zendesk.com/agent/tickets/20062 + url( + r"^information-governance/health-and-care-information-governance-panel/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052114/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/about-health-and-care-ig-panel/", + lambda request: redirect( + r",https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052119/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/about-health-and-care-ig-panel/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/people/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052102/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/people/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/people/dame-fiona-caldicott/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052102/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/people/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/people/ian-hulme/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052102/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/people/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/people/jackie-gray/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052102/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/people/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/people/edward-morris/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052102/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/people/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/people/dr-tony-calland/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052102/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/people/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/people/dawn-monaghan/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052102/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/people/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/people/andrew-hughes/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052102/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/people/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/people/elizabeth-bohm/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052102/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/people/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/people/simon-richardson/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052102/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/people/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2019-10-10/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2020-01-28/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2020-03-11/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2020-07-28/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2020-09-15/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2020-11-26/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2021-03-24/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2021-05-18/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2021-07-20/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2021-11-23/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2022-03-22/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), + url( + r"^information-governance/health-and-care-information-governance-panel/minutes/2022-05-24/", + lambda request: redirect( + r"https://webarchive.nationalarchives.gov.uk/ukgwa/20240501052022/https://transform.england.nhs.uk/information-governance/health-and-care-information-governance-panel/minutes/", + permanent=True, + ), + ), ]