Merge branch 'release/3.8.5'

csfieldguide/config/__init__.py

@@ -1,3 +1,3 @@
 """Module for Django system configuration."""
 
-__version__ = "3.8.4"
+__version__ = "3.8.5"

csfieldguide/config/settings/base.py

@@ -292,3 +292,4 @@
 STATICI18N_ROOT = BUILD_ROOT
 SVG_DIRS = [os.path.join(str(ROOT_DIR.path("staticfiles")), "svg")]
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+X_FRAME_OPTIONS = "SAMEORIGIN"

csfieldguide/config/settings/production.py

@@ -72,4 +72,3 @@
 # SECURE_SSL_REDIRECT = env.bool("DJANGO_SECURE_SSL_REDIRECT", default=True)  # noqa: F405
 # CSRF_COOKIE_SECURE = True
 # CSRF_COOKIE_HTTPONLY = True
-# X_FRAME_OPTIONS = "SAMEORIGIN"

csfieldguide/package.json

@@ -6,12 +6,12 @@
     "dependencies": {},
     "devDependencies": {
         "ansi-colors": "4.1.1",
-        "autoprefixer": "10.3.6",
+        "autoprefixer": "10.3.7",
         "bootstrap": "4.6.0",
         "browser-sync": "2.27.5",
         "browserify": "17.0.0",
         "child_process": "1.0.2",
-        "codemirror": "5.62.3",
+        "codemirror": "5.63.1",
         "cssnano": "5.0.8",
         "details-element-polyfill": "2.4.0",
         "fancy-log": "1.3.3",
@@ -22,24 +22,24 @@
         "gulp-filter": "7.0.0",
         "gulp-if": "3.0.0",
         "gulp-imagemin": "7.1.0",
-        "gulp-postcss": "9.0.0",
+        "gulp-postcss": "9.0.1",
         "gulp-rename": "2.0.0",
         "gulp-sass": "5.0.0",
         "gulp-sourcemaps": "3.0.0",
         "gulp-tap": "2.0.0",
-        "gulp-terser": "2.0.1",
+        "gulp-terser": "2.1.0",
         "iframe-resizer": "4.3.2",
         "intro.js": "4.2.2",
         "jquery": "3.6.0",
         "lity": "2.4.1",
         "multiple-select": "1.5.2",
         "pixrem": "5.0.0",
         "popper.js": "1.16.1",
-        "postcss": "8.3.6",
+        "postcss": "8.3.9",
         "postcss-flexbugs-fixes": "5.0.2",
         "sass": "1.42.1",
         "vinyl-buffer": "1.0.1",
-        "yargs": "17.1.1",
+        "yargs": "17.2.1",
         "csfg-module-fsa": "file:./static/js/modules/fsa/",
         "csfg-interactive-algorithm-timer": "file:./static/interactives/algorithm-timer/",
         "csfg-interactive-big-number-calculator": "file:./static/interactives/big-number-calculator/",

dev

@@ -90,14 +90,14 @@ defhelp update 'Run Django migrate and updatedata commands and build static file
 # Run Django makemigrations command
 cmd_makemigrations() {
   echo "Creating database migrations..."
-  docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py makemigrations --no-input
+  docker-compose -f docker-compose.local.yml exec django python ./manage.py makemigrations --no-input
 }
 defhelp makemigrations 'Run Django makemigrations command.'
 
 # Run Django migrate command
 cmd_migrate() {
   echo "Applying database migrations..."
-  docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py migrate
+  docker-compose -f docker-compose.local.yml exec django python ./manage.py migrate
 }
 defhelp migrate 'Run Django migrate command.'
 

docker-compose.local.yml

@@ -64,18 +64,12 @@ services:
             - ./infrastructure/local/postgres/.envs
         networks:
             - backend
-        volumes:
-            - local-postgres-data:/var/lib/postgresql/data:Z
-            - local-postgres-data-backups:/backups:z
-
 
     elasticsearch:
         image: elasticsearch:5
         restart: always
         networks:
             - backend
-        volumes:
-            - local-search-index:/usr/share/elasticsearch/data:Z
 
     docs:
         image: ghcr.io/uccser/local-docs-image:latest
@@ -98,8 +92,3 @@ networks:
         driver: bridge
     uccser-development-proxy:
         external: true
-
-volumes:
-    local-postgres-data: {}
-    local-postgres-data-backups: {}
-    local-search-index: {}

docker-compose.prod.yml

@@ -51,6 +51,10 @@ services:
                 - "traefik.http.routers.cs-field-guide-django.service=cs-field-guide-django"
                 - "traefik.http.routers.cs-field-guide-django.rule=${CS_FIELD_GUIDE_ROUTER_RULE}"
                 - "traefik.http.routers.cs-field-guide-django.entryPoints=web"
+                # Redirect non-www to www, only triggers in production swarm.
+                - "traefik.http.middlewares.redirect-non-www.redirectregex.regex=^https://csfieldguide\\.org(.*)"
+                - "traefik.http.middlewares.redirect-non-www.redirectregex.replacement=https://www.csfieldguide.org$${1}"
+                - "traefik.http.middlewares.redirect-non-www.redirectregex.permanent=true"
         networks:
             - uccser-public
             - backend

docs/changelog.rst

@@ -18,6 +18,26 @@ All notable changes to this project will be documented in this file.
 We have listed major changes for each release below.
 `All downloads are available on GitHub <https://github.com/uccser/cs-field-guide/releases/>`__
 
+3.8.5
+==============================================================================
+
+**Release date:** 6th October 2021
+
+**Changelog:**
+
+- Fix bug where interactives in chapters were not displaying.
+- Redirect non-www requests to www subdomain at Traefik router.
+- Run migration commands in existing container to allow access to created files.
+- Remove Docker compose volumes to avoid issues with development.
+- Dependency changes:
+
+  - Update autoprefixer from 10.3.6 to 10.3.7.
+  - Update codemirror from 5.62.3 to 5.63.1.
+  - Update django from 3.2.7 to 3.2.8.
+  - Update gulp-postcss from 2.0.1 to 2.1.0.
+  - Update postcss from 8.3.6 to 8.3.9.
+  - Update yargs from 17.1.1 to 17.2.1.
+
 3.8.4
 ==============================================================================
 
@@ -36,15 +56,17 @@ We have listed major changes for each release below.
 
 - Rebuild search index when updating data, instead of application start.
 - Modify configuration for Docker Swarm services to specify updatedata task.
-- Update crowdin/github-action from 1.3.2 to 1.4.0.
-- Update autoprefixer from 10.3.2 to 10.3.6.
-- Update intro.js from 4.1.0 to 4.2.2.
-- Update sass from 1.38.0 to 1.42.1.
-- Update sphinx from 4.1.2 to 4.2.1.
-- Update sphinx-rtd-theme from 0.5.2 to 1.0.0.
-- Update django from 3.2.6 to 3.2.7.
-- Update django-environ from 0.4.5 to 0.7.0.
-- Update django-haystack[elasticsearch] from 3.0 to 3.1.1.
+- Dependency changes:
+
+  - Update crowdin/github-action from 1.3.2 to 1.4.0.
+  - Update autoprefixer from 10.3.2 to 10.3.6.
+  - Update intro.js from 4.1.0 to 4.2.2.
+  - Update sass from 1.38.0 to 1.42.1.
+  - Update sphinx from 4.1.2 to 4.2.1.
+  - Update sphinx-rtd-theme from 0.5.2 to 1.0.0.
+  - Update django from 3.2.6 to 3.2.7.
+  - Update django-environ from 0.4.5 to 0.7.0.
+  - Update django-haystack[elasticsearch] from 3.0 to 3.1.1.
 
 3.8.2
 ==============================================================================

requirements/base.txt

@@ -1,5 +1,5 @@
 # Django
-django==3.2.7
+django==3.2.8
 django-environ==0.7.0
 django-bootstrap-breadcrumbs==0.9.2