Use the latest containers

.coveragerc

@@ -2,9 +2,9 @@
 omit =
     config/*
     docs/*
+    dev/*
     etna/**/migrations/*
     etna/**/tests/*
-    fabfile.py
     gunicorn.conf.py
     manage.py
 source = .

.dockerignore

@@ -16,10 +16,9 @@
 Dockerfile
 README.md
 babel.config.json
-database_dumps
+dev
 docker-compose.yml
 docs
-fabfile.py
 gunicorn.conf.py
 lint-requirements.txt
 media

.env.example

@@ -1,12 +1,4 @@
-DATABASE_ENGINE=django.db.backends.postgresql
-DATABASE_NAME=postgres
-DATABASE_USER=postgres
-DATABASE_HOST=db
-PLATFORM_PROJECT_ID=
 KONG_CLIENT_BASE_URL=
 KONG_IMAGE_PREVIEW_BASE_URL=
 KONG_CLIENT_KEY=
-KONG_CLIENT_VERIFY_CERTIFICATES=True
-KONG_CLIENT_TEST_MODE=False
-KONG_CLIENT_TEST_FILENAME=records.json
 PLATFORMSH_CLI_TOKEN=your-api-token-here

.eslintrc.js

@@ -2,16 +2,14 @@ module.exports = {
     env: {
         browser: true,
         es2021: true,
-        jquery: true,
-        jest: true,
     },
     extends: ["eslint:recommended"],
     overrides: [
         {
             env: {
                 node: true,
             },
-            files: [".eslintrc.{js}"],
+            files: [".eslintrc.{js,cjs}"],
             parserOptions: {
                 sourceType: "script",
             },
@@ -22,5 +20,10 @@ module.exports = {
         sourceType: "module",
     },
     rules: {},
-    ignorePatterns: ["templates/static/scripts/**/*.js", ".*.js", "*.config.js"],
+    ignorePatterns: [
+        "templates/static/scripts/**/*.js",
+        ".*.js",
+        "*.config.js",
+        "static",
+    ],
 };

.flake8

@@ -0,0 +1,6 @@
+[flake8]
+ignore = E203, E266, E501, W503, F403, F401
+exclude = venv*,__pycache__,node_modules,migrations
+max-line-length = 80
+max-complexity = 12
+select = B,C,E,F,W,T4,B9

.gitignore

@@ -25,10 +25,6 @@ templates/static
 /static/*
 !/static/.gitkeep
 
-# Ignore the contents of /database_dumps but keep the directory
-/database_dumps/*
-!/database_dumps/.gitkeep
-
 # Database backups
 /db/
 

.isort.cfg

@@ -0,0 +1,3 @@
+[settings]
+profile=hug
+skip=migrations

.prettierignore

@@ -1,2 +1,3 @@
 # Ignore all HTML files:
-**/*.html
+**/*.html
+etna/api/tests/expected_results/**/*

.vscode/tasks.json

@@ -2,62 +2,28 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "fab start",
+            "label": "Start",
             "type": "shell",
-            "command": "fab start",
-            "presentation": {
-                "close": true
-            },
-        },
-        {
-            "label": "fab build",
-            "type": "shell",
-            "command": "fab build",
+            "command": "docker compose up -d",
             "presentation": {
                 "close": true
             },
         },
         {
             "label": "Pull staging",
             "type": "shell",
-            "command": "fab pull-staging-data && fab pull-staging-media",
+            "command": "docker compose exec dev pull",
             "presentation": {
                 "close": true
             },
         },
         {
             "label": "Pull production",
             "type": "shell",
-            "command": "fab pull-production-data && fab pull-production-media",
+            "command": "docker compose exec dev pull main",
             "presentation": {
                 "close": true
             }
         },
-        {
-            "label": "Full build (staging)",
-            "type": "shell",
-            "presentation": {
-                "close": true
-            },
-            "dependsOrder": "sequence",
-            "dependsOn": [
-                "fab build",
-                "fab start",
-                "Pull staging"
-            ]
-        },
-        {
-            "label": "Full build (production)",
-            "type": "shell",
-            "presentation": {
-                "close": true
-            },
-            "dependsOrder": "sequence",
-            "dependsOn": [
-                "fab build",
-                "fab start",
-                "Pull production"
-            ]
-        },
     ],
 }

Dockerfile

@@ -1,26 +1,25 @@
-FROM ghcr.io/nationalarchives/tna-python-django:latest
+ARG IMAGE=ghcr.io/nationalarchives/tna-python-django
+ARG IMAGE_TAG=latest
 
-ENV NPM_BUILD_COMMAND=compile
-ENV DJANGO_SETTINGS_MODULE=config.settings.production
+FROM "$IMAGE":"$IMAGE_TAG"
 
-HEALTHCHECK CMD curl --fail http://localhost:8080/healthcheck/ || exit 1
+ENV NPM_BUILD_COMMAND=compile
+ARG BUILD_VERSION
+ENV BUILD_VERSION="$BUILD_VERSION"
 
-# Copy in the project dependency files and config
-COPY --chown=app pyproject.toml poetry.lock ./
-COPY --chown=app package.json package-lock.json .nvmrc webpack.config.js ./
-COPY --chown=app sass sass
-COPY --chown=app scripts scripts
-COPY --chown=app config config
-COPY --chown=app templates templates
+# Copy in the application code
+COPY --chown=app . .
 
-# Install Python dependencies AND the 'etna' app
+# Install dependencies
 RUN tna-build
 
-# Copy application code
-COPY --chown=app . .
-
 # Copy the assets from the @nationalarchives/frontend repository
+# TODO: Remove once completely headless
 RUN mkdir -p /app/templates/static/assets; \
-  cp -R /app/node_modules/@nationalarchives/frontend/nationalarchives/assets/* /app/templates/static/assets
+  cp -R /app/node_modules/@nationalarchives/frontend/nationalarchives/assets/* /app/templates/static/assets; \
+  poetry run python /app/manage.py collectstatic --no-input --clear
+
+# Delete source files, tests and docs
+# RUN rm -fR /app/src /app/test /app/docs
 
 CMD ["tna-run", "config.wsgi:application"]

README.md

@@ -7,7 +7,6 @@
 This project contains technical documentation written in Markdown in the /docs folder. The latest build (from the `develop` branch) can be viewed online at:
 https://nationalarchives.github.io/ds-wagtail/
 
-
 You can also view it locally on http://localhost:8001/ which is booted as the `docs` container.
 
 ## Setting up a local build
@@ -24,76 +23,29 @@ Once installed, you can type `fab -l` to see a list of available commands.
 cp .env.example .env
 ```
 
-### 1. Build and start Docker containers
+Populate values for:
 
-```sh
-fab start
-```
+- `KONG_CLIENT_BASE_URL`
+- `KONG_IMAGE_PREVIEW_BASE_URL`
+- `KONG_CLIENT_KEY`
+- `PLATFORMSH_CLI_TOKEN`
 
-This command takes care of the following:
-
-1. Building all of the necessary Docker containers
-2. Starting all of the necessary Docker containers
-3. Installing any new python dependencies
-4. Collect static assets
-
-### 2. Start the development server
+### 1. Build and start Docker containers
 
 ```sh
-# Enter the shell for the web container
-fab sh
-
-# Run migrations
-poetry run python manage.py migrate
-
-# Run the development server
-poetry run python manage.py runserver 0.0.0.0:8000
+docker compose up -d
 ```
 
 ### 2. Access the site
 
 <http://127.0.0.1:8000>
 
-### 3. Create a Django user for yourself
-
-```sh
-# ...from within the web container
-python manage.py createsuperuser
-
-# ...or on the host machine
-fab create-superuser
-```
-
-### 4. Access the Wagtail admin
+### 3. Access the Wagtail admin
 
 Navigate to the admin URL in your browser, and sign in using the username/password combination you chose in the previous step.
 
 <http://127.0.0.1:8000/admin/>
 
-### 5. Compile the front-end assets
-See https://nationalarchives.github.io/ds-wagtail/developer-guide/frontend/#setting-up-the-front-end-development-environment
-
-## Linux / OSX
-If you are running a Unix based operating system, these alias commands may be useful to you to run inside the Docker container.
-
-Running the development server:
-
-``` sh
-djrun
-```
-
-Run migrations:
-
-```sh
-dj migrate
-```
-
-Create a super user:
-
-```sh
-dj createsuperuser
-```
-
 ## Issues with your local environment?
 
 Check out the [Local development gotchas](https://nationalarchives.github.io/ds-wagtail/developer-guide/local-development-gotchas/) page for solutions to common issues.