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, + ), + ), ] 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.

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: diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile index e62e05f8..e8a88c1a 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 \ @@ -125,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 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