Update to upstream current - June 2026

.dockerignore

@@ -1,4 +1,6 @@
 __pycache__
+**/tests
+locale/**/*.po
 *.pyc
 *.pyo
 *.pyd

.env.dev.example

@@ -0,0 +1,4 @@
+DOMAIN=localhost
+PORT=1333
+DEBUG=true
+NGINX_SETUP=reverse_proxy

.env.example

@@ -35,13 +35,19 @@ DEFAULT_LANGUAGE="English"
 STATIC_ROOT=static/
 MEDIA_ROOT=images/
 
+# A comma-separated list of max dimensions for use uploads, each entry denotes a new version
+UPLOAD_IMAGE_DIMENSIONS=400,1200,2000
+
 # Database configuration
 PGPORT=5432
 # POSTGRES_PASSWORD=securedbypassword123
 POSTGRES_USER=bookwyrm
 POSTGRES_DB=bookwyrm
 POSTGRES_HOST=db
 
+# Docker container shared memory size, tune accordingly for your db/host memory size if needed
+POSTGRES_SHM_SIZE=128mb
+
 # Redis activity stream manager
 MAX_STREAM_LENGTH=200
 REDIS_ACTIVITY_HOST=redis_activity
@@ -105,8 +111,7 @@ S3_SIGNED_URL_EXPIRY=900
 # AWS_S3_REGION_NAME=None         # "fr-par"
 # AWS_S3_ENDPOINT_URL=None        # "https://s3.fr-par.scw.cloud"
 # AWS_DEFAULT_ACL=""              # AWS_DEFAULT_ACL defaults to public-read, however, not all providers, e.g. BackBlaze, support it.
-                                  # Uncomment and set this value to an empty string (for Back Blaze) or whatever is required by your provider to override it. 
-
+# Uncomment and set this value to an empty string (for Back Blaze) or whatever is required by your provider to override it.
 
 # Commented are example values if you use Azure Blob Storage
 # USE_AZURE=true

.eslintrc.js

@@ -86,5 +86,16 @@ module.exports = {
             },
         ],
         "space-before-blocks": "error",
+    },
+    "globals": {
+        "gettext": "readonly",
+        "ngettext": "readonly",
+        "interpolate": "readonly",
+        "get_format": "readonly",
+        "gettext_noop": "readonly",
+        "pgettext": "readonly",
+        "npgettext": "readonly",
+        "pluralidx": "readonly",
+        "django": "readonly"
     }
 };

.github/pull_request_template.md

@@ -1,40 +1,21 @@
-<!--
-Thanks for contributing! This template has some checkboxes that help keep track of what changes go into a release.
-
-To check (tick) a list item, replace the space between square brackets with an x, like this:
-
-- [x] I have checked the box
-
-You can find more information and tips for BookWyrm contributors at https://docs.joinbookwyrm.com/contributing.html
--->
 ## Description
-<!--
-Describe what your pull request does here
--->
 
 
-<!--
-For pull requests that relate or close an issue, please include them
-below.  We like to follow [Github's guidance on linking issues to pull requests](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
-
-For example having the text: "closes #1234" would connect the current pull
-request to issue 1234.  And when we merge the pull request, Github will
-automatically close the issue.
--->
-
 - Related Issue #
 - Closes #
 
+<!--
+Thanks for contributing! This template has some checkboxes that help keep track of what changes go into a release.
+You can find more information and tips for BookWyrm contributors at https://docs.joinbookwyrm.com/contributing.html
+-->
 ## What type of Pull Request is this?
-<!-- Check all that apply -->
 
 - [ ] Bug Fix
 - [ ] Enhancement
 - [ ] Plumbing / Internals / Dependencies
 - [ ] Refactor
 
 ## Does this PR change settings or dependencies, or break something?
-<!-- Check all that apply -->
 
 - [ ] This PR changes or adds default settings, configuration, or .env values
 - [ ] This PR changes or adds dependencies
@@ -45,22 +26,18 @@ automatically close the issue.
 
 ## Documentation
 <!--
-Documentation for users, admins, and developers is an important way to keep the BookWyrm community welcoming and make Bookwyrm easy to use.
 Our documentation is maintained in a separate repository at https://github.com/bookwyrm-social/documentation
 -->
 
-<!-- Check all that apply -->
-
 - [ ] New or amended documentation will be required if this PR is merged
 - [ ] I have created a matching pull request in the Documentation repository
 - [ ] I intend to create a matching pull request in the Documentation repository after this PR is merged
 
 <!-- Amazing! Thanks for filling that out. Your PR will need to have passing tests and happy linters before we can merge
-You will need to check your code with `black`, `pylint`, and `mypy`, or `./bw-dev formatters`
+You will need to check your code with `ruff` and `mypy`, or `./bw-dev formatters`
 -->
 
 ### Tests
-<!-- Check one -->
 
 - [ ] My changes do not need new tests
 - [ ] All tests I have added are passing

.github/workflows/container.yml

@@ -0,0 +1,81 @@
+name: Container building for release
+
+on:
+  pull_request:
+    branches: ["main"]
+    paths:
+      - ".github/workflows/container.yml"
+      - "Dockerfile"
+      - "entrypoint.sh"
+      - "postgres-docker/*"
+  push:
+    branches: ["main"]
+    tags:
+      - v*
+  release:
+    types:
+      - released
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Docker tag for build results"
+        type: string
+        default: manual
+        required: true
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        image: [bookwyrm, postgres-backup]
+        include:
+          - image: bookwyrm
+            context: .
+          - image: postgres-backup
+            context: postgres-docker
+    uses: docker/github-builder/.github/workflows/build.yml@v1
+    permissions:
+      contents: read # for checkout
+      packages: write # to upload build to GHCR
+      id-token: write # signing attestations with github oidc token
+    with:
+      output: image
+      push: ${{ github.event_name != 'pull_request' }}
+      context: ${{ matrix.context }}
+      platforms: linux/amd64,linux/arm64
+      cache: true
+      cache-mode: max
+      fail-fast: true
+      sbom: true
+      sign: false
+      cache-scope: ${{ matrix.image }}
+      meta-images: ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}
+      meta-tags: |
+        type=raw,value=${{ inputs.tag }},event=workflow_dispatch
+        type=semver,pattern=v{{version}}
+        type=ref,event=branch
+      meta-flavor: |
+        latest=${{ github.event_name == 'release' }}
+      set-meta-labels: true
+      set-meta-annotations: true
+    secrets:
+      registry-auths: |
+        - registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+  cleanup:
+    needs: build
+    if: ${{ github.ref_name == 'main' }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        image: [bookwyrm, postgres-backup]
+    permissions:
+      packages: write
+
+    steps:
+      - uses: dataaxiom/ghcr-cleanup-action@v1
+        with:
+          package: ${{ matrix.image }}
+          delete-untagged: true
+          older-than: 1 hour

.github/workflows/eslint.yaml

@@ -0,0 +1,25 @@
+name: Lint JavaScript
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  lint:
+    name: Lint with ESLint.
+    runs-on: ubuntu-24.04
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it.
+      - uses: actions/checkout@v4
+
+      - name: Install modules
+        run: npm install eslint@^8.9.0
+
+      # See .eslintignore for files that are not linted.
+      - name: Run ESLint
+        run: >
+          npx eslint bookwyrm/static \
+            --ext .js,.jsx,.ts,.tsx