Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prod release #803

Merged
merged 9 commits into from
Aug 23, 2024
Merged

Prod release #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c81a06e
Prefer docker composer to docker-compose on CI
snim2 Aug 21, 2024
a4d923a
Dockerfile uses sudo to install envkey
snim2 Aug 22, 2024
aba8284
Install poetry more defensively
snim2 Aug 22, 2024
3eb32c3
Remove deprecated 'version' from docker-compose
snim2 Aug 22, 2024
64145c4
Merge pull request #801 from nhsx/fix/docker-build
snim2 Aug 23, 2024
022a6f8
Change wording of reviewed guidance notice
snim2 Aug 21, 2024
3cb75b3
Merge pull request #800 from nhsx/chore/ticket-20058
snim2 Aug 23, 2024
4f291cc
Add site redirects
snim2 Aug 23, 2024
3dab50d
Merge pull request #802 from nhsx/chore/ticket-20062
snim2 Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 176 additions & 0 deletions app/config/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
),
]


Expand Down
4 changes: 2 additions & 2 deletions app/templates/ig_guidance/internal_guidance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
{% block content %}
<div class="template-guidance__warning">
<div class="nhsuk-width-container">
<p class="template-guidance__warning__body"><strong>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).</strong></p>
<p class="template-guidance__warning__body">The panel exists to simplify information governance guidance. Have we done a good job? Let us know at <a href="mailto:[email protected]">[email protected]</a>.</p>
<p class="template-guidance__warning__body"><strong>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).</strong></p>
<p class="template-guidance__warning__body">Have we done a good job? <a href="https://nhsplatform.corestream.co.uk/public/form/IGPolicyQuery">Let us know</a>.</p>
</div>
</div>
<div class="nhsuk-width-container nhsai-resource_page">
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.7'

services:
# Postgres
db:
Expand Down
10 changes: 7 additions & 3 deletions docker/web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion script/cibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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