Merge branch 'main' into johannes/msc4156

Author: Johennes

.github/CODEOWNERS

@@ -1 +1 @@
-* @matrix-org/dendrite-core
+* @element-hq/dendrite-core

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -6,7 +6,7 @@ about: Suggest an idea for this project
 
 <!--
 Please do not open feature requests for missing parts of the Matrix specification.
-We are tracking those features under https://github.com/matrix-org/dendrite/issues?q=is%3Aissue+is%3Aopen+label%3Aare-we-synapse-yet
+We are tracking those features under https://github.com/element-hq/dendrite/issues?q=is%3Aissue+is%3Aopen+label%3Aare-we-synapse-yet
 -->
 
 **Description:**

.github/workflows/dendrite.yml

@@ -5,14 +5,14 @@ on:
     branches:
       - main
     paths:
-      - '**.go'                 # only execute on changes to go files
-      - 'go.sum'                # or dependency updates
-      - '.github/workflows/**'  # or workflow changes
+      - "**.go" # only execute on changes to go files
+      - "go.sum" # or dependency updates
+      - ".github/workflows/**" # or workflow changes
   pull_request:
     paths:
-      - '**.go'
-      - 'go.sum'                # or dependency updates
-      - '.github/workflows/**'
+      - "**.go"
+      - "go.sum" # or dependency updates
+      - ".github/workflows/**"
   release:
     types: [published]
   workflow_dispatch:
@@ -33,7 +33,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
           cache: true
 
       - name: Install Node
@@ -72,7 +72,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
 
@@ -108,7 +108,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v4
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
       - uses: actions/cache@v4
         # manually set up caches, as they otherwise clash with different steps using setup-go with cache=true
         with:
@@ -145,7 +145,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v4
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
       - uses: actions/cache@v4
         with:
           path: |
@@ -178,7 +178,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
       - uses: actions/cache@v4
         with:
           path: |
@@ -241,7 +241,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v4
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
       - name: Set up gotestfmt
         uses: gotesttools/gotestfmt-action@v2
         with:
@@ -279,7 +279,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v4
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
           cache: true
       - uses: actions/cache@v4
         with:
@@ -309,7 +309,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v4
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
           cache: true
       - uses: actions/cache@v4
         with:
@@ -474,7 +474,7 @@ jobs:
         upgrade_test_direct,
         sytest,
         complement,
-        integration
+        integration,
       ]
     runs-on: ubuntu-latest
     if: ${{ !cancelled() }} # Run this even if prior jobs were skipped
@@ -490,8 +490,8 @@ jobs:
       packages: write
       contents: read
       security-events: write # To upload Trivy sarif files
-    if: github.repository == 'matrix-org/dendrite' && github.ref_name == 'main'
+    if: github.repository == 'element-hq/dendrite' && github.ref_name == 'main'
     needs: [integration-tests-done]
-    uses: matrix-org/dendrite/.github/workflows/docker.yml@main
+    uses: element-hq/dendrite/.github/workflows/docker.yml@main
     secrets:
       DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}

Dockerfile

@@ -30,10 +30,10 @@ FROM alpine:latest
 RUN apk --update --no-cache add curl
 LABEL org.opencontainers.image.title="Dendrite"
 LABEL org.opencontainers.image.description="Next-generation Matrix homeserver written in Go"
-LABEL org.opencontainers.image.source="https://github.com/matrix-org/dendrite"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.documentation="https://matrix-org.github.io/dendrite/"
-LABEL org.opencontainers.image.vendor="The Matrix.org Foundation C.I.C."
+LABEL org.opencontainers.image.source="https://github.com/element-hq/dendrite"
+LABEL org.opencontainers.image.licenses="AGPL-3.0-only OR LicenseRef-Element-Commercial"
+LABEL org.opencontainers.image.documentation="https://element-hq.github.io/dendrite/"
+LABEL org.opencontainers.image.vendor="New Vector Ltd."
 
 COPY --from=build /out/create-account /usr/bin/create-account
 COPY --from=build /out/generate-config /usr/bin/generate-config
@@ -45,4 +45,3 @@ WORKDIR /etc/dendrite
 
 ENTRYPOINT ["/usr/bin/dendrite"]
 EXPOSE 8008 8448
-