Develop to master for various updates, and change to caching

.github/workflows/workflow.yml

@@ -117,7 +117,7 @@ jobs:
             --resource-group "${{ env.STAGE }}-${{ env.NAME }}-${{ env.NEW_COLOUR }}" \
             --name "${{ env.STAGE }}-${{ env.NAME }}-${{ env.NEW_COLOUR }}" \
             --size Standard_B2s \
-            --image `az vm image list --all -p Canonical -f UbuntuServer -s 18.04-LTS --query [].urn -o tsv | sort | tail -n 1` \
+            --image "Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:latest" \
             --ssh-key-values ${{ secrets.DEV_PUB_KEYS }} && \
             export NEW_IP=$(az vm list-ip-addresses --name "${{ env.STAGE }}-${{ env.NAME }}-${{ env.NEW_COLOUR }}" --resource-group "${{ env.STAGE }}-${{ env.NAME }}-${{ env.NEW_COLOUR }}" --query [].virtualMachine.network[].publicIpAddresses[][].ipAddress --output tsv) && \
             echo "NEW_IP=$NEW_IP" >> $GITHUB_ENV && \
@@ -327,7 +327,7 @@ jobs:
             --resource-group "${{ env.STAGE }}-${{ env.NAME }}-${{ env.NEW_COLOUR }}" \
             --name "${{ env.STAGE }}-${{ env.NAME }}-${{ env.NEW_COLOUR }}" \
             --size Standard_B2s \
-            --image `az vm image list --all -p Canonical -f UbuntuServer -s 18.04-LTS --query [].urn -o tsv | sort | tail -n 1` \
+            --image "Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:latest" \
             --ssh-key-values ${{ secrets.DEV_PUB_KEYS }} && \
             export NEW_IP=$(az vm list-ip-addresses --name "${{ env.STAGE }}-${{ env.NAME }}-${{ env.NEW_COLOUR }}" --resource-group "${{ env.STAGE }}-${{ env.NAME }}-${{ env.NEW_COLOUR }}" --query [].virtualMachine.network[].publicIpAddresses[][].ipAddress --output tsv) && \
             echo "NEW_IP=$NEW_IP" >> $GITHUB_ENV && \

Dockerfile

@@ -45,11 +45,11 @@ RUN apk add --no-cache libmemcached-dev zlib-dev
 
 RUN apk add --no-cache openjdk8-jre su-exec
 
-ENV VERSION 6.8.21
+ENV VERSION 6.8.23
 ENV DOWNLOAD_URL "https://artifacts.elastic.co/downloads/elasticsearch"
 ENV ES_TARBAL "${DOWNLOAD_URL}/elasticsearch-oss-${VERSION}.tar.gz"
 # ENV EXPECTED_SHA_URL "${DOWNLOAD_URL}/elasticsearch-oss-${VERSION}.tar.gz.sha512"
-ENV ES_TARBALL_SHA "875b34db1458f51e1c738ef82a0c00aae7c558e0eb76c149d354d3be8695bb3d4397dddff9ab76cc111f1c4cb64b9767ac63cb15155007f4403e7ab930acd40a"
+ENV ES_TARBALL_SHA "14dbb2809b06499373c3ec5035d829d62255c2c93103618fbfe3d7d03cecf8847f654e83c78f765f23224126ff18ed713b959857e8ecf435c475b11bcd143d3f"
 RUN apk add --no-cache -t .build-deps wget ca-certificates gnupg openssl \
   && set -ex \
   && cd /tmp \
@@ -96,6 +96,7 @@ COPY requirements_dev.txt /usr/src/app/
 COPY entrypoint.sh /usr/src/app/
 ENV VIRTUAL_ENV=/usr/src/venv
 ENV PATH=$VIRTUAL_ENV/bin:$HOME/.cargo/bin:$PATH
+ENV PYTHONPATH=/usr/src/app/
 
 RUN apk -U upgrade
 # Use a virtual env here, because othewise we get conflicats between Alpine's

iati/settings/base.py

@@ -643,12 +643,12 @@
 # Caches
 CACHES = {
     'default': {
-        'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
         'LOCATION': 'wagtail_cache',
         'TIMEOUT': 86400,
     },
     'renditions': {
-        'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
         'LOCATION': 'wagtail_renditions_cache',
         'TIMEOUT': 86400,
     }

requirements.in

@@ -1,26 +1,26 @@
-Babel==2.9.1
-beautifulsoup4==4.8.2
-bleach==3.3.0
-dj-database-url==0.5
-django-compressor==4.1
-django-extensions==3.1.3
-django-import-export==2.5.0
-django-haystack==3.0
-django-modeltranslation==0.17.2
-django-prettyjson==0.4.1
-django-recaptcha3==0.4.0
-django-storages[azure]==1.11.1
-django-widget-tweaks==1.4.8
-Django==3.2.4
-elasticsearch==6.8.2
-gunicorn==20.1.0
-opencensus-ext-azure==1.0.7
-opencensus-ext-django==0.7.4
-PyGithub==1.55
-psycopg2-binary==2.8.6
-requests==2.25.1
-wagtail-modeltranslation==0.13.0
+Babel
+beautifulsoup4
+bleach
+dj-database-url
+django-compressor
+django-extensions
+django-import-export
+django-haystack
+django-modeltranslation
+django-prettyjson
+django-recaptcha3
+django-storages[azure]
+django-widget-tweaks
+Django>=3.2,<3.3
+elasticsearch>=6.8,<7
+gunicorn
+opencensus-ext-azure
+opencensus-ext-django
+PyGithub
+psycopg2-binary
+requests
+wagtail-modeltranslation
 wagtail>=4.1,<4.2
-Wand==0.6.6
-whitenoise==5.2.0
-wrapt==1.11.*
+Wand
+whitenoise
+wrapt